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

Remove Order.TargetLocation.

Browse Source
This commit is contained in:
Paul Chote
2018-12-01 12:02:36 +00:00
parent c7dc237143
commit 00496e2ec2
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,17 +49,6 @@ namespace OpenRA
public bool SuppressVisualFeedback; public bool SuppressVisualFeedback;
public Target VisualFeedbackTarget; 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; } } 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) Order(string orderString, Actor subject, Target target, string targetString, bool queued, CPos extraLocation, uint extraData)
@@ -331,10 +320,9 @@ namespace OpenRA
public override string ToString() public override string ToString()
{ {
return ("OrderString: \"{0}\" \n\t Subject: \"{1}\". \n\t TargetActor: \"{2}\" \n\t TargetLocation: {3}." + return ("OrderString: \"{0}\" \n\t Subject: \"{1}\". \n\t Target: \"{2}\"." +
"\n\t TargetString: \"{4}\".\n\t IsImmediate: {5}.\n\t Player(PlayerName): {6}\n").F( "\n\t TargetString: \"{3}\".\n\t IsImmediate: {4}.\n\t Player(PlayerName): {5}\n").F(
OrderString, Subject, Target.Type == TargetType.Actor ? Target.Actor.Info.Name : null, TargetLocation, OrderString, Subject, Target, TargetString, IsImmediate, Player != null ? Player.PlayerName : null);
TargetString, IsImmediate, Player != null ? Player.PlayerName : null);
} }
} }
} }