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

Add World parameter to Target.FromCell.

Browse Source
This commit is contained in:
Paul Chote
2013-09-17 21:50:15 +12:00
parent e4ea012b9e
commit 086ec07eb6
21 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Move/Mobile.cs
View File

@@ -375,7 +375,7 @@ namespace OpenRA.Mods.RA.Move
self.QueueActivity(new Move(currentLocation, 8));
self.SetTargetLine(Target.FromCell(currentLocation), Color.Green);
self.SetTargetLine(Target.FromCell(self.World, currentLocation), Color.Green);
}
protected void PerformMove(Actor self, CPos targetLocation, bool queued)
@@ -542,7 +542,7 @@ namespace OpenRA.Mods.RA.Move
if (moveTo.HasValue)
{
self.CancelActivity();
self.SetTargetLine(Target.FromCell(moveTo.Value), Color.Green, false);
self.SetTargetLine(Target.FromCell(self.World, moveTo.Value), Color.Green, false);
self.QueueActivity(new Move(moveTo.Value, 0));
Log.Write("debug", "OnNudge #{0} from {1} to {2}",

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

@@ -251,9 +251,9 @@ namespace OpenRA.Mods.RA.Move
public override IEnumerable<Target> GetTargets(Actor self)
{
if (path != null)
return Enumerable.Reverse(path).Select(c => Target.FromCell(c));
return Enumerable.Reverse(path).Select(c => Target.FromCell(self.World, c));
if (destination != null)
return new Target[] { Target.FromCell(destination.Value) };
return new Target[] { Target.FromCell(self.World, destination.Value) };
return Target.None;
}