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

Changed most references of trait Mobile -> IMove.

Browse Source 
In Mobile.cs IsMoving now has a public set as opposed to the initial internal. 
Added IMoveInfo interface to go with *Info classes that require IMove.
WithRotor now uses IMove.IsMoving instead of (self.CenterPosition.Z > 0) as part of a check.
This commit is contained in:
Taryn
2014-02-02 01:30:21 -06:00
parent 4b38390907
commit 9c4ad15d1e
13 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,13 +73,13 @@ namespace OpenRA.Mods.RA
if( !CanRepairAt( order.TargetActor ) || !CanRepair() )
return;
var mobile = self.Trait<Mobile>();
var movement = self.Trait<IMove>();
var target = Target.FromOrder(order);
self.SetTargetLine(target, Color.Green);
self.CancelActivity();
self.QueueActivity(new MoveAdjacentTo(self, target));
self.QueueActivity(mobile.MoveTo(order.TargetActor.CenterPosition.ToCPos(), order.TargetActor));
self.QueueActivity(movement.MoveTo(order.TargetActor.CenterPosition.ToCPos(), order.TargetActor));
self.QueueActivity(new Rearm(self));
self.QueueActivity(new Repair(order.TargetActor));
@@ -88,7 +88,7 @@ namespace OpenRA.Mods.RA
self.QueueActivity(new CallFunc(() =>
{
self.SetTargetLine(Target.FromCell(rp.rallyPoint), Color.Green);
self.QueueActivity(mobile.MoveTo(rp.rallyPoint, order.TargetActor));
self.QueueActivity(movement.MoveTo(rp.rallyPoint, order.TargetActor));
}));
}
}