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

added Queued field to order

Browse Source
This commit is contained in:
Bob
2010-05-31 14:20:25 +12:00
parent f2bcf1afae
commit 1e570b5edb
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,34 +31,36 @@ namespace OpenRA
public readonly Actor TargetActor; public readonly Actor TargetActor;
public readonly int2 TargetLocation; public readonly int2 TargetLocation;
public readonly string TargetString; public readonly string TargetString;
public readonly bool Queued;
public bool IsImmediate; public bool IsImmediate;
public Player Player { get { return Subject.Owner; } } public Player Player { get { return Subject.Owner; } }
public Order(string orderString, Actor subject, public Order(string orderString, Actor subject,
Actor targetActor, int2 targetLocation, string targetString) Actor targetActor, int2 targetLocation, string targetString, bool queued)
{ {
this.OrderString = orderString; this.OrderString = orderString;
this.Subject = subject; this.Subject = subject;
this.TargetActor = targetActor; this.TargetActor = targetActor;
this.TargetLocation = targetLocation; this.TargetLocation = targetLocation;
this.TargetString = targetString; this.TargetString = targetString;
this.Queued = queued;
} }
public Order(string orderString, Actor subject) public Order(string orderString, Actor subject)
: this(orderString, subject, null, int2.Zero, null) { } : this(orderString, subject, null, int2.Zero, null, false) { }
public Order(string orderString, Actor subject, Actor targetActor) public Order(string orderString, Actor subject, Actor targetActor)
: this(orderString, subject, targetActor, int2.Zero, null) { } : this(orderString, subject, targetActor, int2.Zero, null, false) { }
public Order(string orderString, Actor subject, int2 targetLocation) public Order(string orderString, Actor subject, int2 targetLocation)
: this(orderString, subject, null, targetLocation, null) { } : this(orderString, subject, null, targetLocation, null, false) { }
public Order(string orderString, Actor subject, string targetString) public Order(string orderString, Actor subject, string targetString)
: this(orderString, subject, null, int2.Zero, targetString) { } : this(orderString, subject, null, int2.Zero, targetString, false) { }
public Order(string orderString, Actor subject, Actor targetActor, int2 targetLocation) public Order(string orderString, Actor subject, Actor targetActor, int2 targetLocation)
: this(orderString, subject, targetActor, targetLocation, null) { } : this(orderString, subject, targetActor, targetLocation, null, false) { }
public Order(string orderString, Actor subject, Actor targetActor, string targetString) public Order(string orderString, Actor subject, Actor targetActor, string targetString)
: this(orderString, subject, targetActor, int2.Zero, targetString) { } : this(orderString, subject, targetActor, int2.Zero, targetString, false) { }
public Order(string orderString, Actor subject, int2 targetLocation, string targetString) public Order(string orderString, Actor subject, int2 targetLocation, string targetString)
: this(orderString, subject, null, targetLocation, targetString) { } : this(orderString, subject, null, targetLocation, targetString, false) { }
public byte[] Serialize() public byte[] Serialize()
{ {
@@ -92,6 +94,7 @@ namespace OpenRA
w.Write(TargetString != null); w.Write(TargetString != null);
if (TargetString != null) if (TargetString != null)
w.Write(TargetString); w.Write(TargetString);
w.Write(Queued);
return ret.ToArray(); return ret.ToArray();
} }
} }
@@ -111,12 +114,13 @@ namespace OpenRA
var targetString = null as string; var targetString = null as string;
if (r.ReadBoolean()) if (r.ReadBoolean())
targetString = r.ReadString(); targetString = r.ReadString();
var queued = r.ReadBoolean();
Actor subject, targetActor; Actor subject, targetActor;
if( !TryGetActorFromUInt( world, subjectId, out subject ) || !TryGetActorFromUInt( world, targetActorId, out targetActor ) ) if( !TryGetActorFromUInt( world, subjectId, out subject ) || !TryGetActorFromUInt( world, targetActorId, out targetActor ) )
return null; return null;
return new Order( order, subject, targetActor, targetLocation, targetString); return new Order( order, subject, targetActor, targetLocation, targetString, queued);
} }
case 0xfe: case 0xfe: