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

finished removing ctors from Order

Browse Source
This commit is contained in:
Chris Forbes
2010-11-23 15:33:15 +13:00
parent 7b5be4a0ec
commit 730ed8c597
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,8 +60,6 @@ namespace OpenRA
public Order(string orderString, Actor subject, bool queued) public Order(string orderString, Actor subject, bool queued)
: this(orderString, subject, null, int2.Zero, null, queued, int2.Zero) { } : this(orderString, subject, null, int2.Zero, null, queued, int2.Zero) { }
public Order(string orderString, Actor subject, string targetString, bool queued)
: this(orderString, subject, null, int2.Zero, targetString, queued, int2.Zero) { }
public byte[] Serialize() public byte[] Serialize()
{ {
@@ -141,7 +139,7 @@ namespace OpenRA
var name = r.ReadString(); var name = r.ReadString();
var data = r.ReadString(); var data = r.ReadString();
return new Order( name, null, data, false ) { IsImmediate = true }; return new Order( name, null, false ) { IsImmediate = true, TargetString = data };
} }
default: default:
@@ -185,17 +183,17 @@ namespace OpenRA
// Now that Orders are resolved by individual Actors, these are weird; you unpack orders manually, but not pack them. // Now that Orders are resolved by individual Actors, these are weird; you unpack orders manually, but not pack them.
public static Order Chat(string text) public static Order Chat(string text)
{ {
return new Order("Chat", null, text, false) { IsImmediate = true }; return new Order("Chat", null, false) { IsImmediate = true, TargetString = text};
} }
public static Order TeamChat(string text) public static Order TeamChat(string text)
{ {
return new Order("TeamChat", null, text, false) { IsImmediate = true }; return new Order("TeamChat", null, false) { IsImmediate = true, TargetString = text };
} }
public static Order Command(string text) public static Order Command(string text)
{ {
return new Order("Command", null, text, false) { IsImmediate = true }; return new Order("Command", null, false) { IsImmediate = true, TargetString = text };
} }
public static Order StartProduction(Actor subject, string item, int count) public static Order StartProduction(Actor subject, string item, int count)

8
OpenRA.Game/Orders/UnitOrderGenerator.cs
View File

@@ -45,9 +45,11 @@ namespace OpenRA.Orders
var actorsInvolved = orders.Select(o => o.self).Distinct(); var actorsInvolved = orders.Select(o => o.self).Distinct();
if (actorsInvolved.Any()) if (actorsInvolved.Any())
yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor, yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor, false)
string.Join(",", actorsInvolved.Select(a => a.ActorID.ToString()).ToArray()), false) {
; TargetString = string.Join(",", actorsInvolved.Select(a => a.ActorID.ToString()).ToArray())
};
foreach (var o in orders) foreach (var o in orders)
yield return CheckSameOrder(o.iot, o.trait.IssueOrder(o.self, o.iot, o.target, mi.Modifiers.HasModifier(Modifiers.Shift))); yield return CheckSameOrder(o.iot, o.trait.IssueOrder(o.self, o.iot, o.target, mi.Modifiers.HasModifier(Modifiers.Shift)));