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

Fixed ChronoshiftDeploy; there's only one order there, not two.

Browse Source
This commit is contained in:
Bob
2010-01-03 14:33:12 +13:00
parent 1c9393a410
commit 43498a123e
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRa.Game/Traits/ChronoshiftDeploy.cs
View File

@@ -20,20 +20,19 @@ namespace OpenRa.Game.Traits
{
if (mi.Button == MouseButton.Left) return null;
else if (xy == self.Location && remainingChargeTime <= 0)
return new Order("Deploy", self, null, int2.Zero, null);
if( mi.Button == MouseButton.Right && xy == self.Location && remainingChargeTime <= 0 )
{
if( mi.IsFake )
return new Order( "Deploy", self, null, int2.Zero, null );
else
Game.controller.orderGenerator = new TeleportOrderGenerator( self );
}
return null;
}
public void ResolveOrder(Actor self, Order order)
{
if (order.OrderString == "Deploy" && remainingChargeTime <= 0)
{
Game.controller.orderGenerator = new TeleportOrderGenerator(self);
self.CancelActivity();
}
var movement = self.traits.WithInterface<IMovement>().FirstOrDefault();
if (order.OrderString == "Chronoshift" && movement.CanEnterCell(order.TargetLocation))
{