diff --git a/OpenRA.Mods.RA/Cargo.cs b/OpenRA.Mods.RA/Cargo.cs index 0d435a2404..55654ec82b 100644 --- a/OpenRA.Mods.RA/Cargo.cs +++ b/OpenRA.Mods.RA/Cargo.cs @@ -38,11 +38,7 @@ namespace OpenRA.Mods.RA public IEnumerable Orders { - get - { - yield return new DeployOrderTargeter( "Unload", 10, () => CanUnload( self ) ); - yield return new UnitTraitOrderTargeter( "ReverseEnterTransport", 6, null, false, true ); - } + get { yield return new DeployOrderTargeter( "Unload", 10, () => CanUnload( self ) ); } } public Order IssueOrder( Actor self, IOrderTargeter order, Target target, bool queued ) @@ -50,9 +46,6 @@ namespace OpenRA.Mods.RA if( order.OrderID == "Unload" ) return new Order( order.OrderID, self, queued ); - if( order.OrderID == "ReverseEnterTransport" ) - return new Order(order.OrderID, self, queued) { TargetActor = target.Actor }; - return null; } @@ -66,16 +59,6 @@ namespace OpenRA.Mods.RA self.CancelActivity(); self.QueueActivity(new UnloadCargo()); } - - if( order.OrderString == "ReverseEnterTransport" ) - { - if( order.TargetActor != null && order.Subject.Owner == order.TargetActor.Owner ) - { - var passenger = order.TargetActor.Trait(); - passenger.ResolveOrder(order.TargetActor, - new Order("EnterTransport", order.TargetActor, false) { TargetActor = self }); - } - } } bool CanUnload(Actor self)