From e4ea012b9ee5a1917d90bc2cce17b60ea65bedef Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Tue, 17 Sep 2013 21:46:03 +1200 Subject: [PATCH] Add World parameter to Target.FromOrder. --- OpenRA.Game/Traits/Target.cs | 2 +- OpenRA.Mods.RA/ActorExts.cs | 2 +- OpenRA.Mods.RA/Air/Plane.cs | 2 +- OpenRA.Mods.RA/Harvester.cs | 2 +- OpenRA.Mods.RA/Passenger.cs | 2 +- OpenRA.Mods.RA/Repairable.cs | 4 ++-- OpenRA.Mods.RA/RepairableNear.cs | 2 +- OpenRA.Mods.RA/RepairsBridges.cs | 2 +- OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OpenRA.Game/Traits/Target.cs b/OpenRA.Game/Traits/Target.cs index ef20a253c5..fbf3c4e88a 100644 --- a/OpenRA.Game/Traits/Target.cs +++ b/OpenRA.Game/Traits/Target.cs @@ -29,7 +29,7 @@ namespace OpenRA.Traits public static Target FromPos(WPos p) { return new Target { pos = p, type = TargetType.Terrain }; } public static Target FromCell(CPos c) { return new Target { pos = c.CenterPosition, type = TargetType.Terrain }; } - public static Target FromOrder(Order o) + public static Target FromOrder(World w, Order o) { return o.TargetActor != null ? FromActor(o.TargetActor) diff --git a/OpenRA.Mods.RA/ActorExts.cs b/OpenRA.Mods.RA/ActorExts.cs index e1b3c59d49..5a25c408e4 100644 --- a/OpenRA.Mods.RA/ActorExts.cs +++ b/OpenRA.Mods.RA/ActorExts.cs @@ -43,7 +43,7 @@ namespace OpenRA.Mods.RA { // Not targeting a frozen actor if (order.ExtraData == 0) - return Target.FromOrder(order); + return Target.FromOrder(self.World, order); // Targeted an actor under the fog var frozenLayer = self.Owner.PlayerActor.TraitOrDefault(); diff --git a/OpenRA.Mods.RA/Air/Plane.cs b/OpenRA.Mods.RA/Air/Plane.cs index 40f81c5b43..0d2ae9b4aa 100755 --- a/OpenRA.Mods.RA/Air/Plane.cs +++ b/OpenRA.Mods.RA/Air/Plane.cs @@ -71,7 +71,7 @@ namespace OpenRA.Mods.RA.Air UnReserve(); - self.SetTargetLine(Target.FromOrder(order), Color.Green); + self.SetTargetLine(Target.FromOrder(self.World, order), Color.Green); self.CancelActivity(); self.QueueActivity(new ReturnToBase(self, order.TargetActor)); diff --git a/OpenRA.Mods.RA/Harvester.cs b/OpenRA.Mods.RA/Harvester.cs index 254f7debb9..9faef49aab 100644 --- a/OpenRA.Mods.RA/Harvester.cs +++ b/OpenRA.Mods.RA/Harvester.cs @@ -336,7 +336,7 @@ namespace OpenRA.Mods.RA idleSmart = true; - self.SetTargetLine(Target.FromOrder(order), Color.Green); + self.SetTargetLine(Target.FromOrder(self.World, order), Color.Green); self.CancelActivity(); self.QueueActivity(new DeliverResources()); diff --git a/OpenRA.Mods.RA/Passenger.cs b/OpenRA.Mods.RA/Passenger.cs index 6e4ad6e8dc..54785a9567 100644 --- a/OpenRA.Mods.RA/Passenger.cs +++ b/OpenRA.Mods.RA/Passenger.cs @@ -76,7 +76,7 @@ namespace OpenRA.Mods.RA if (!CanEnter(order.TargetActor)) return; if (!IsCorrectCargoType(order.TargetActor)) return; - var target = Target.FromOrder(order); + var target = Target.FromOrder(self.World, order); self.SetTargetLine(target, Color.Green); self.CancelActivity(); diff --git a/OpenRA.Mods.RA/Repairable.cs b/OpenRA.Mods.RA/Repairable.cs index 6dde7d55c0..607827d546 100644 --- a/OpenRA.Mods.RA/Repairable.cs +++ b/OpenRA.Mods.RA/Repairable.cs @@ -69,11 +69,11 @@ namespace OpenRA.Mods.RA { if (order.OrderString == "Repair") { - if( !CanRepairAt( order.TargetActor ) || !CanRepair() ) + if (!CanRepairAt(order.TargetActor) || !CanRepair()) return; var movement = self.Trait(); - var target = Target.FromOrder(order); + var target = Target.FromOrder(self.World, order); self.SetTargetLine(target, Color.Green); self.CancelActivity(); diff --git a/OpenRA.Mods.RA/RepairableNear.cs b/OpenRA.Mods.RA/RepairableNear.cs index 11e0a0ed61..352fd0098a 100644 --- a/OpenRA.Mods.RA/RepairableNear.cs +++ b/OpenRA.Mods.RA/RepairableNear.cs @@ -65,7 +65,7 @@ namespace OpenRA.Mods.RA if (order.OrderString == "RepairNear" && CanRepairAt(order.TargetActor) && ShouldRepair()) { var movement = self.Trait(); - var target = Target.FromOrder(order); + var target = Target.FromOrder(self.World, order); self.CancelActivity(); self.QueueActivity(movement.MoveWithinRange(target, new WRange(1024*info.CloseEnough))); diff --git a/OpenRA.Mods.RA/RepairsBridges.cs b/OpenRA.Mods.RA/RepairsBridges.cs index 798da2f1aa..f4a469ea25 100644 --- a/OpenRA.Mods.RA/RepairsBridges.cs +++ b/OpenRA.Mods.RA/RepairsBridges.cs @@ -56,7 +56,7 @@ namespace OpenRA.Mods.RA if (bridge.BridgeDamageState == DamageState.Undamaged) return; - self.SetTargetLine(Target.FromOrder(order), Color.Yellow); + self.SetTargetLine(Target.FromOrder(self.World, order), Color.Yellow); self.CancelActivity(); self.QueueActivity(new Enter(order.TargetActor, new RepairBridge(order.TargetActor))); diff --git a/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs b/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs index 9eb2730673..201cef454a 100644 --- a/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs +++ b/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs @@ -64,7 +64,7 @@ namespace OpenRA.Mods.RA }); a.CancelActivity(); - a.QueueActivity(new FlyAttack(Target.FromOrder(order))); + a.QueueActivity(new FlyAttack(Target.FromOrder(self.World, order))); a.Trait().SetLZ(order.TargetLocation); var cargo = a.Trait();