Skip to content

Commit

Permalink
Remove Order.TargetLocation.
Browse files Browse the repository at this point in the history
  • Loading branch information
pchote committed Dec 6, 2018
1 parent c0bd65c commit b5e1105
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions OpenRA.Game/Network/Order.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,6 @@ public sealed class Order
public bool SuppressVisualFeedback;
public Target VisualFeedbackTarget;

/// <summary>
/// DEPRECATED: Use Target instead.
/// </summary>
public CPos TargetLocation
{
get
{
return Target.SerializableCell ?? CPos.Zero;
}
}

public Player Player { get { return Subject != null ? Subject.Owner : null; } }

Order(string orderString, Actor subject, Target target, string targetString, bool queued, CPos extraLocation, uint extraData)
Expand Down Expand Up @@ -332,10 +321,9 @@ public byte[] Serialize()

public override string ToString()
{
return ("OrderString: \"{0}\" \n\t Subject: \"{1}\". \n\t TargetActor: \"{2}\" \n\t TargetLocation: {3}." +
"\n\t TargetString: \"{4}\".\n\t IsImmediate: {5}.\n\t Player(PlayerName): {6}\n").F(
OrderString, Subject, Target.Type == TargetType.Actor ? Target.Actor.Info.Name : null, TargetLocation,
TargetString, IsImmediate, Player != null ? Player.PlayerName : null);
return ("OrderString: \"{0}\" \n\t Subject: \"{1}\". \n\t Target: \"{2}\"." +
"\n\t TargetString: \"{3}\".\n\t IsImmediate: {4}.\n\t Player(PlayerName): {5}\n").F(
OrderString, Subject, Target, TargetString, IsImmediate, Player != null ? Player.PlayerName : null);
}
}
}

0 comments on commit b5e1105

Please sign in to comment.