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

Remove deprecated Order.TargetActor and Target.FromOrder.

Browse Source
This commit is contained in:
Paul Chote
2018-05-27 12:37:19 +01:00
committed by reaperrr
parent 768265bbd2
commit ba8eac0e38
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,11 +50,6 @@ namespace OpenRA
public bool SuppressVisualFeedback; public bool SuppressVisualFeedback;
public Target VisualFeedbackTarget; public Target VisualFeedbackTarget;
/// <summary>
/// DEPRECATED: Use Target instead.
/// </summary>
public Actor TargetActor { get { return Target.SerializableActor; } }
/// <summary> /// <summary>
/// DEPRECATED: Use Target instead. /// DEPRECATED: Use Target instead.
/// </summary> /// </summary>
@@ -326,7 +321,7 @@ namespace OpenRA
{ {
return ("OrderString: \"{0}\" \n\t Subject: \"{1}\". \n\t TargetActor: \"{2}\" \n\t TargetLocation: {3}." + 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( "\n\t TargetString: \"{4}\".\n\t IsImmediate: {5}.\n\t Player(PlayerName): {6}\n").F(
OrderString, Subject, TargetActor != null ? TargetActor.Info.Name : null, TargetLocation, OrderString, Subject, Target.Type == TargetType.Actor ? Target.Actor.Info.Name : null, TargetLocation,
TargetString, IsImmediate, Player != null ? Player.PlayerName : null); TargetString, IsImmediate, Player != null ? Player.PlayerName : null);
} }
} }

11
OpenRA.Game/Traits/Target.cs
View File

@@ -41,17 +41,6 @@ namespace OpenRA.Traits
}; };
} }
/// <summary>
/// DEPRECATED: Use Order.Target instead.
/// This method is kept to maintain compatibility with legacy code that may not understand TargetType.FrozenActor.
/// </summary>
public static Target FromOrder(World w, Order o)
{
return o.TargetActor != null
? FromActor(o.TargetActor)
: FromCell(w, o.TargetLocation);
}
public static Target FromActor(Actor a) public static Target FromActor(Actor a)
{ {
if (a == null) if (a == null)