From dfc4b07b1a1159d297c62706d7e6bce0434834d9 Mon Sep 17 00:00:00 2001 From: Scott_NZ Date: Sun, 20 Jan 2013 18:17:33 +1300 Subject: [PATCH] Campaign: Don't rely on world.issueorder anymore --- OpenRA.Mods.RA/Missions/Allies01Script.cs | 11 +---------- OpenRA.Mods.RA/Missions/Allies02Script.cs | 5 +---- OpenRA.Mods.RA/Missions/Allies03Script.cs | 5 +---- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/OpenRA.Mods.RA/Missions/Allies01Script.cs b/OpenRA.Mods.RA/Missions/Allies01Script.cs index f05ad3a268..2a20d66120 100644 --- a/OpenRA.Mods.RA/Missions/Allies01Script.cs +++ b/OpenRA.Mods.RA/Missions/Allies01Script.cs @@ -299,16 +299,7 @@ namespace OpenRA.Mods.RA.Missions { foreach (var actor in world.Actors.Where(a => a.IsInWorld && a.Owner == allies && !a.IsDead())) { - var at = actor.TraitOrDefault(); - if (at != null) - { - at.predictedStance = UnitStance.Defend; - } - var order = new Order("SetUnitStance", actor, false) { TargetLocation = new CPos((int)UnitStance.Defend, 0) }; - if (Game.IsHost) - { - world.IssueOrder(order); - } + actor.Trait().stance = UnitStance.Defend; } } diff --git a/OpenRA.Mods.RA/Missions/Allies02Script.cs b/OpenRA.Mods.RA/Missions/Allies02Script.cs index 909e38ff15..eff5d46501 100644 --- a/OpenRA.Mods.RA/Missions/Allies02Script.cs +++ b/OpenRA.Mods.RA/Missions/Allies02Script.cs @@ -402,10 +402,7 @@ namespace OpenRA.Mods.RA.Missions { return; } - if (Game.IsHost) - { - world.IssueOrder(Order.StartProduction(queue.self, unit, 1)); - } + queue.ResolveOrder(queue.self, Order.StartProduction(queue.self, unit, 1)); } void SpawnSignalFlare() diff --git a/OpenRA.Mods.RA/Missions/Allies03Script.cs b/OpenRA.Mods.RA/Missions/Allies03Script.cs index dba661ddb4..d36afe6268 100644 --- a/OpenRA.Mods.RA/Missions/Allies03Script.cs +++ b/OpenRA.Mods.RA/Missions/Allies03Script.cs @@ -278,10 +278,7 @@ namespace OpenRA.Mods.RA.Missions { return; } - if (Game.IsHost) - { - world.IssueOrder(Order.StartProduction(queue.self, YakName, 1)); - } + queue.ResolveOrder(queue.self, Order.StartProduction(queue.self, YakName, 1)); } IEnumerable SovietAircraft()