From cebf908bb2e6589ac62f039dbd70aaedd7f806e0 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 25 Apr 2012 00:20:54 +1200 Subject: [PATCH] Fixed #2041 -- Force attack always targeted ground Revert "Force attacks always go through, regardless of what is beneath them." This reverts commit b2c72d69903a681966706565205b552cf186ae2b. --- OpenRA.Game/Orders/UnitOrderGenerator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Game/Orders/UnitOrderGenerator.cs b/OpenRA.Game/Orders/UnitOrderGenerator.cs index 921610452d..bc48460593 100644 --- a/OpenRA.Game/Orders/UnitOrderGenerator.cs +++ b/OpenRA.Game/Orders/UnitOrderGenerator.cs @@ -88,7 +88,7 @@ namespace OpenRA.Orders var forceAttack = mi.Modifiers.HasModifier(Modifiers.Ctrl); var forceQueue = mi.Modifiers.HasModifier(Modifiers.Shift); string cursor = null; - if( underCursor != null && !forceAttack ) + if( underCursor != null ) if (o.Order.CanTargetActor(self, underCursor, forceAttack, forceQueue, ref cursor)) return new UnitOrderResult( self, o.Order, o.Trait, cursor, Target.FromActor( underCursor ) ); if (o.Order.CanTargetLocation(self, xy, actorsAt, forceAttack, forceQueue, ref cursor))