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

simplify repair order

Browse Source
This commit is contained in:
Chris Forbes
2010-05-13 17:37:24 +12:00
parent 823d7d44a9
commit 00d8505b42
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/Traits/Repairable.cs
View File

@@ -51,18 +51,17 @@ namespace OpenRA.Traits
if (order.OrderString == "Enter") if (order.OrderString == "Enter")
{ {
var res = order.TargetActor.traits.GetOrDefault<Reservable>(); var res = order.TargetActor.traits.GetOrDefault<Reservable>();
var wp = order.TargetActor.traits.GetOrDefault<RallyPoint>().rallyPoint; var rp = order.TargetActor.traits.GetOrDefault<RallyPoint>();
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new Move(((1 / 24f) * order.TargetActor.CenterLocation).ToInt2(), order.TargetActor)); self.QueueActivity(new Move(((1 / 24f) * order.TargetActor.CenterLocation).ToInt2(), order.TargetActor));
self.QueueActivity(new Rearm()); self.QueueActivity(new Rearm());
self.QueueActivity(new Repair()); self.QueueActivity(new Repair());
if (order.TargetActor.traits.Contains<RallyPoint>())
self.QueueActivity(new CallFunc( if (rp != null)
() => self.QueueActivity(new Move(order.TargetActor.traits.Get<RallyPoint>().rallyPoint, self.QueueActivity(new CallFunc(
order.TargetActor)))); () => self.QueueActivity(new Move(rp.rallyPoint, order.TargetActor))));
} }
} }
} }