From da5830845bd9cf268088a786d75d98f0d90c189c Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 23 Nov 2010 15:24:45 +1300 Subject: [PATCH] remove another ctor --- OpenRA.Game/Network/Order.cs | 10 ++++------ OpenRA.Mods.RA/HackyAI.cs | 7 +++++-- OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs | 7 +++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/OpenRA.Game/Network/Order.cs b/OpenRA.Game/Network/Order.cs index da11dc4f76..a07a593b2b 100755 --- a/OpenRA.Game/Network/Order.cs +++ b/OpenRA.Game/Network/Order.cs @@ -46,7 +46,7 @@ namespace OpenRA public Player Player { get { return Subject.Owner; } } - public Order(string orderString, Actor subject, + Order(string orderString, Actor subject, Actor targetActor, int2 targetLocation, string targetString, bool queued, int2 extraLocation) { this.OrderString = orderString; @@ -66,8 +66,6 @@ namespace OpenRA : this(orderString, subject, targetActor, targetLocation, null, queued, int2.Zero) { } public Order(string orderString, Actor subject, Actor targetActor, string targetString, bool queued) : this(orderString, subject, targetActor, int2.Zero, targetString, queued, int2.Zero) { } - public Order(string orderString, Actor subject, int2 targetLocation, string targetString, bool queued) - : this(orderString, subject, null, targetLocation, targetString, queued, int2.Zero) { } public byte[] Serialize() { @@ -206,17 +204,17 @@ namespace OpenRA public static Order StartProduction(Actor subject, string item, int count) { - return new Order("StartProduction", subject, new int2( count, 0 ), item, false ); + return new Order("StartProduction", subject, false) { TargetLocation = new int2(count, 0), TargetString = item }; } public static Order PauseProduction(Actor subject, string item, bool pause) { - return new Order("PauseProduction", subject, new int2( pause ? 1 : 0, 0 ), item, false); + return new Order("PauseProduction", subject, false) { TargetLocation = new int2(pause ? 1 : 0, 0), TargetString = item }; } public static Order CancelProduction(Actor subject, string item, int count) { - return new Order("CancelProduction", subject, new int2( count, 0 ), item, false); + return new Order("CancelProduction", subject, false) { TargetLocation = new int2(count, 0), TargetString = item }; } } } diff --git a/OpenRA.Mods.RA/HackyAI.cs b/OpenRA.Mods.RA/HackyAI.cs index edab77cf56..999ea8456e 100644 --- a/OpenRA.Mods.RA/HackyAI.cs +++ b/OpenRA.Mods.RA/HackyAI.cs @@ -475,8 +475,11 @@ namespace OpenRA.Mods.RA } else { - ai.world.IssueOrder(new Order("PlaceBuilding", ai.p.PlayerActor, - location.Value, currentBuilding.Item, false)); + ai.world.IssueOrder(new Order("PlaceBuilding", ai.p.PlayerActor, false) + { + TargetLocation = location.Value, + TargetString = currentBuilding.Item + }); } } break; diff --git a/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs b/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs index 033b0dbc97..7bfa18c65c 100755 --- a/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs +++ b/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs @@ -53,10 +53,9 @@ namespace OpenRA.Mods.RA.Orders yield break; } - if (Rules.Info[ Building ].Traits.Contains()) - yield return new Order("LineBuild", Producer.Owner.PlayerActor, topLeft, Building, false); - else - yield return new Order("PlaceBuilding", Producer.Owner.PlayerActor, topLeft, Building, false); + var isLineBuild = Rules.Info[ Building ].Traits.Contains(); + yield return new Order(isLineBuild ? "LineBuild" : "PlaceBuilding", + Producer.Owner.PlayerActor, false) { TargetLocation = topLeft, TargetString = Building }; } }