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

remove another ctor

Browse Source
This commit is contained in:
Chris Forbes
2010-11-23 15:24:45 +13:00
parent 23e6eada26
commit da5830845b
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Network/Order.cs
View File

@@ -46,7 +46,7 @@ namespace OpenRA
public Player Player { get { return Subject.Owner; } } 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) Actor targetActor, int2 targetLocation, string targetString, bool queued, int2 extraLocation)
{ {
this.OrderString = orderString; this.OrderString = orderString;
@@ -66,8 +66,6 @@ namespace OpenRA
: this(orderString, subject, targetActor, targetLocation, null, queued, int2.Zero) { } : this(orderString, subject, targetActor, targetLocation, null, queued, int2.Zero) { }
public Order(string orderString, Actor subject, Actor targetActor, string targetString, bool queued) public Order(string orderString, Actor subject, Actor targetActor, string targetString, bool queued)
: this(orderString, subject, targetActor, int2.Zero, targetString, queued, int2.Zero) { } : 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() public byte[] Serialize()
{ {
@@ -206,17 +204,17 @@ namespace OpenRA
public static Order StartProduction(Actor subject, string item, int count) 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) 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) 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 };
} }
} }
} }

7
OpenRA.Mods.RA/HackyAI.cs
View File

@@ -475,8 +475,11 @@ namespace OpenRA.Mods.RA
} }
else else
{ {
ai.world.IssueOrder(new Order("PlaceBuilding", ai.p.PlayerActor, ai.world.IssueOrder(new Order("PlaceBuilding", ai.p.PlayerActor, false)
location.Value, currentBuilding.Item, false)); {
TargetLocation = location.Value,
TargetString = currentBuilding.Item
});
} }
} }
break; break;

7
OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -53,10 +53,9 @@ namespace OpenRA.Mods.RA.Orders
yield break; yield break;
} }
if (Rules.Info[ Building ].Traits.Contains<LineBuildInfo>()) var isLineBuild = Rules.Info[ Building ].Traits.Contains<LineBuildInfo>();
yield return new Order("LineBuild", Producer.Owner.PlayerActor, topLeft, Building, false); yield return new Order(isLineBuild ? "LineBuild" : "PlaceBuilding",
else Producer.Owner.PlayerActor, false) { TargetLocation = topLeft, TargetString = Building };
yield return new Order("PlaceBuilding", Producer.Owner.PlayerActor, topLeft, Building, false);
} }
} }