merged. may not actually work yet.

This commit is contained in:
Chris Forbes
2010-01-09 11:34:44 +13:00
10 changed files with 66 additions and 65 deletions

View File

@@ -13,7 +13,7 @@ namespace OpenRa.Game
public readonly int2 TargetLocation;
public readonly string TargetString;
public bool IsImmediate;
public Actor Subject { get { return ActorFromUInt(SubjectId); } }
public Actor TargetActor { get { return ActorFromUInt(TargetActorId); } }
public Player Player { get { return Subject.Owner; } }
@@ -21,8 +21,8 @@ namespace OpenRa.Game
public Order(string orderString, Actor subject,
Actor targetActor, int2 targetLocation, string targetString)
: this( orderString, UIntFromActor( subject ),
UIntFromActor( targetActor ), targetLocation, targetString ) {}
UIntFromActor( targetActor ), targetLocation, targetString) {}
Order(string orderString, uint subjectId,
uint targetActorId, int2 targetLocation, string targetString)
{
@@ -30,7 +30,7 @@ namespace OpenRa.Game
this.SubjectId = subjectId;
this.TargetActorId = targetActorId;
this.TargetLocation = targetLocation;
this.TargetString = targetString;
this.TargetString = targetString;
}
public bool Validate()