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

Remove legacy Move constructor.

Browse Source
This commit is contained in:
Paul Chote
2016-06-18 14:03:58 +01:00
parent a421a191b5
commit 30dcbeb873
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Activities/Move/Move.cs
View File

@@ -57,10 +57,6 @@ namespace OpenRA.Mods.Common.Activities
nearEnough = WDist.Zero; nearEnough = WDist.Zero;
} }
// HACK: for legacy code
public Move(Actor self, CPos destination, int nearEnough)
: this(self, destination, WDist.FromCells(nearEnough)) { }
public Move(Actor self, CPos destination, WDist nearEnough) public Move(Actor self, CPos destination, WDist nearEnough)
{ {
mobile = self.Trait<Mobile>(); mobile = self.Trait<Mobile>();

6
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -504,7 +504,7 @@ namespace OpenRA.Mods.Common.Traits
TicksBeforePathing = AverageTicksBeforePathing + self.World.SharedRandom.Next(-SpreadTicksBeforePathing, SpreadTicksBeforePathing); TicksBeforePathing = AverageTicksBeforePathing + self.World.SharedRandom.Next(-SpreadTicksBeforePathing, SpreadTicksBeforePathing);
self.QueueActivity(new Move(self, currentLocation, 8)); self.QueueActivity(new Move(self, currentLocation, WDist.FromCells(8)));
self.SetTargetLine(Target.FromCell(self.World, currentLocation), Color.Green); self.SetTargetLine(Target.FromCell(self.World, currentLocation), Color.Green);
} }
@@ -683,7 +683,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
self.CancelActivity(); self.CancelActivity();
self.SetTargetLine(Target.FromCell(self.World, moveTo.Value), Color.Green, false); self.SetTargetLine(Target.FromCell(self.World, moveTo.Value), Color.Green, false);
self.QueueActivity(new Move(self, moveTo.Value, 0)); self.QueueActivity(new Move(self, moveTo.Value, WDist.Zero));
Log.Write("debug", "OnNudge #{0} from {1} to {2}", Log.Write("debug", "OnNudge #{0} from {1} to {2}",
self.ActorID, self.Location, moveTo.Value); self.ActorID, self.Location, moveTo.Value);
@@ -762,7 +762,7 @@ namespace OpenRA.Mods.Common.Traits
} }
public Activity ScriptedMove(CPos cell) { return new Move(self, cell); } public Activity ScriptedMove(CPos cell) { return new Move(self, cell); }
public Activity MoveTo(CPos cell, int nearEnough) { return new Move(self, cell, nearEnough); } public Activity MoveTo(CPos cell, int nearEnough) { return new Move(self, cell, WDist.FromCells(nearEnough)); }
public Activity MoveTo(CPos cell, Actor ignoredActor) { return new Move(self, cell, ignoredActor); } public Activity MoveTo(CPos cell, Actor ignoredActor) { return new Move(self, cell, ignoredActor); }
public Activity MoveWithinRange(Target target, WDist range) { return new MoveWithinRange(self, target, WDist.Zero, range); } public Activity MoveWithinRange(Target target, WDist range) { return new MoveWithinRange(self, target, WDist.Zero, range); }
public Activity MoveWithinRange(Target target, WDist minRange, WDist maxRange) { return new MoveWithinRange(self, target, minRange, maxRange); } public Activity MoveWithinRange(Target target, WDist minRange, WDist maxRange) { return new MoveWithinRange(self, target, minRange, maxRange); }