epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GetTargetQueue -> GetTargets + Exts

Browse Source
This commit is contained in:
alzeih
2011-04-05 21:40:52 +12:00
committed by Paul Chote
parent 820f67e46b
commit 0a67c68c45
13 changed files with 26 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.RA/Activities/CallFunc.cs
View File

@@ -41,16 +41,5 @@ namespace OpenRA.Mods.RA.Activities
a = null;
return true;
}
public override IEnumerable<Target> GetTargetQueue( Actor self )
{
if (NextActivity != null)
foreach (var target in NextActivity.GetTargetQueue(self))
{
yield return target;
}
yield break;
}
}
}

11
OpenRA.Mods.RA/Activities/DeliverOre.cs
View File

@@ -54,16 +54,5 @@ namespace OpenRA.Mods.RA.Activities
// TODO: allow canceling of deliver orders?
return false;
}
public override IEnumerable<Target> GetTargetQueue( Actor self )
{
if (NextActivity != null)
foreach (var target in NextActivity.GetTargetQueue(self))
{
yield return target;
}
yield break;
}
}
}

2
OpenRA.Mods.RA/Activities/Harvest.cs
View File

@@ -76,7 +76,7 @@ namespace OpenRA.Mods.RA.Activities
self.QueueActivity(new Harvest());
}
public override IEnumerable<Target> GetTargetQueue( Actor self )
public override IEnumerable<Target> GetTargets( Actor self )
{
yield return Target.FromPos(self.Location);
}

11
OpenRA.Mods.RA/Activities/QueuedActivity.cs
View File

@@ -43,16 +43,5 @@ namespace OpenRA.Mods.RA.Activities
activity.Queue(NextActivity);
NextActivity = activity;
}
public override IEnumerable<Target> GetTargetQueue( Actor self )
{
if (NextActivity != null)
foreach (var target in NextActivity.GetTargetQueue(self))
{
yield return target;
}
yield break;
}
}
}

2
OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs
View File

@@ -76,7 +76,7 @@ namespace OpenRA.Mods.RA
return true;
}
public override IEnumerable<Target> GetTargetQueue( Actor self )
public override IEnumerable<Target> GetTargets( Actor self )
{
yield return Target.FromActor(proc);
}

2
OpenRA.Mods.RA/Air/Fly.cs
View File

@@ -47,7 +47,7 @@ namespace OpenRA.Mods.RA.Air
return this;
}
public override IEnumerable<Target> GetTargetQueue( Actor self )
public override IEnumerable<Target> GetTargets( Actor self )
{
yield return Target.FromPos(Pos);
}

2
OpenRA.Mods.RA/Air/HeliFly.cs
View File

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.RA.Air
return this;
}
public override IEnumerable<Target> GetTargetQueue( Actor self )
public override IEnumerable<Target> GetTargets( Actor self )
{
yield return Target.FromPos(Dest);
}

2
OpenRA.Mods.RA/Move/Drag.cs
View File

@@ -47,7 +47,7 @@ namespace OpenRA.Mods.RA.Move
return false;
}
public override IEnumerable<Target> GetTargetQueue( Actor self )
public override IEnumerable<Target> GetTargets( Actor self )
{
yield return Target.FromPos(endLocation);
}

6
OpenRA.Mods.RA/Move/Move.cs
View File

@@ -239,7 +239,7 @@ namespace OpenRA.Mods.RA.Move
return true;
}
public override IEnumerable<Target> GetTargetQueue( Actor self )
public override IEnumerable<Target> GetTargets( Actor self )
{
if( path != null )
return Enumerable.Reverse(path).Select( c => Target.FromCell(c) );
@@ -315,9 +315,9 @@ namespace OpenRA.Mods.RA.Move
protected abstract MovePart OnComplete( Actor self, Mobile mobile, Move parent );
public override IEnumerable<Target> GetTargetQueue( Actor self )
public override IEnumerable<Target> GetTargets( Actor self )
{
return move.GetTargetQueue(self);
return move.GetTargets(self);
}
}