From 566303a8f168f97ab001d8757f18c8c8064adb51 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 12 Oct 2010 17:19:00 +1300 Subject: [PATCH] #276 fixed --- OpenRA.Mods.RA/AttackPlane.cs | 10 +++++++--- OpenRA.Mods.RA/Plane.cs | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.RA/AttackPlane.cs b/OpenRA.Mods.RA/AttackPlane.cs index c751a0fc7a..25269e2cfe 100644 --- a/OpenRA.Mods.RA/AttackPlane.cs +++ b/OpenRA.Mods.RA/AttackPlane.cs @@ -24,11 +24,15 @@ namespace OpenRA.Mods.RA protected override void QueueAttack(Actor self, Order order) { - if (self.Trait().Altitude == 0) - return; // dont fire while landed - target = Target.FromOrder(order); self.QueueActivity(new FlyAttack(target)); } + + protected override bool CanAttack(Actor self) + { + // dont fire while landed + return base.CanAttack(self) + && self.Trait().Altitude > 0; + } } } diff --git a/OpenRA.Mods.RA/Plane.cs b/OpenRA.Mods.RA/Plane.cs index 94dc332eec..2c283a3c7a 100644 --- a/OpenRA.Mods.RA/Plane.cs +++ b/OpenRA.Mods.RA/Plane.cs @@ -128,7 +128,7 @@ namespace OpenRA.Mods.RA } else { - Game.Debug("Unreserve due to unhandled order: {0}".F(order.OrderString)); + // Game.Debug("Unreserve due to unhandled order: {0}".F(order.OrderString)); UnReserve(); } }