diff --git a/OpenRA.Game/Network/Order.cs b/OpenRA.Game/Network/Order.cs index 609c3377b3..f941ec1210 100644 --- a/OpenRA.Game/Network/Order.cs +++ b/OpenRA.Game/Network/Order.cs @@ -50,11 +50,6 @@ namespace OpenRA public bool SuppressVisualFeedback; public Target VisualFeedbackTarget; - /// - /// DEPRECATED: Use Target instead. - /// - public Actor TargetActor { get { return Target.SerializableActor; } } - /// /// DEPRECATED: Use Target instead. /// @@ -326,7 +321,7 @@ namespace OpenRA { 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, 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); } } diff --git a/OpenRA.Game/Traits/Target.cs b/OpenRA.Game/Traits/Target.cs index b8a2c7c6f9..35ad5b0b54 100644 --- a/OpenRA.Game/Traits/Target.cs +++ b/OpenRA.Game/Traits/Target.cs @@ -41,17 +41,6 @@ namespace OpenRA.Traits }; } - /// - /// DEPRECATED: Use Order.Target instead. - /// This method is kept to maintain compatibility with legacy code that may not understand TargetType.FrozenActor. - /// - 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) { if (a == null)