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

remove ReverseEnterTransport -- 852

Browse Source
This commit is contained in:
Chris Forbes
2011-05-30 21:15:56 +12:00
parent d54c632812
commit 596e64e527
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.RA/Cargo.cs
View File

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