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

Use WRange for Mobile.MoveWithinRange.

Browse Source
This commit is contained in:
Paul Chote
2013-07-10 19:59:03 +12:00
parent ae987b3c10
commit 91698678a2
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -516,7 +516,7 @@ namespace OpenRA.Mods.RA.Move
public Activity ScriptedMove(CPos cell) { return new Move(cell); }
public Activity MoveTo(CPos cell, int nearEnough) { return new Move(cell, nearEnough); }
public Activity MoveTo(CPos cell, Actor ignoredActor) { return new Move(cell, ignoredActor); }
public Activity MoveWithinRange(Target target, int range) { return new Move(target, range); }
public Activity MoveWithinRange(Target target, WRange range) { return new Move(target, range); }
public Activity MoveTo(Func<List<CPos>> pathFunc) { return new Move(pathFunc); }
}
}

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

@@ -59,19 +59,20 @@ namespace OpenRA.Mods.RA.Move
}
static readonly List<CPos> NoPath = new List<CPos>();
public Move(Target target, int range)
public Move(Target target, WRange range)
{
this.getPath = (self, mobile) =>
{
if (!target.IsValid)
return NoPath;
// TODO: Adjust range to account for target center position
return self.World.WorldActor.Trait<PathFinder>().FindUnitPathToRange(
mobile.toCell, target.CenterPosition.ToCPos(), range, self);
mobile.toCell, target.CenterPosition.ToCPos(), range.Range / 1024, self);
};
this.destination = null;
this.nearEnough = range;
this.nearEnough = range.Range / 1024;
}
public Move(Func<List<CPos>> getPath)