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

remove one of the Move constructors

Browse Source
This commit is contained in:
Chris Forbes
2011-04-17 18:51:04 +12:00
committed by Paul Chote
parent 9541023456
commit 4f76876f05
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -12,10 +12,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Traits.Activities; using OpenRA.Traits.Activities;
using OpenRA.FileFormats;
namespace OpenRA.Mods.RA.Move namespace OpenRA.Mods.RA.Move
{ {
@@ -58,15 +58,6 @@ namespace OpenRA.Mods.RA.Move
this.ignoreBuilding = ignoreBuilding; this.ignoreBuilding = ignoreBuilding;
} }
public Move( Actor target, int range )
{
this.getPath = (self,mobile) => self.World.WorldActor.Trait<PathFinder>().FindUnitPathToRange(
mobile.toCell, target.Location,
range, self );
this.destination = null;
this.nearEnough = range;
}
public Move(Target target, int range) public Move(Target target, int range)
{ {
this.getPath = (self,mobile) => self.World.WorldActor.Trait<PathFinder>().FindUnitPathToRange( this.getPath = (self,mobile) => self.World.WorldActor.Trait<PathFinder>().FindUnitPathToRange(

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

@@ -65,10 +65,13 @@ namespace OpenRA.Mods.RA
if (order.OrderString == "RepairNear" && CanRepairAt(order.TargetActor) && ShouldRepair()) if (order.OrderString == "RepairNear" && CanRepairAt(order.TargetActor) && ShouldRepair())
{ {
var mobile = self.Trait<Mobile>(); var mobile = self.Trait<Mobile>();
var target = Target.FromOrder(order);
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(mobile.MoveWithinRange(order.TargetActor, 1)); self.QueueActivity(mobile.MoveWithinRange(target, 1));
self.SetTargetLine(Target.FromOrder(order), Color.Green, false);
self.QueueActivity(new Repair(order.TargetActor)); self.QueueActivity(new Repair(order.TargetActor));
self.SetTargetLine(target, Color.Green, false);
} }
} }
} }