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

Fixed #2041 -- Force attack always targeted ground

Browse Source 
Revert "Force attacks always go through, regardless of what is beneath them."

This reverts commit b2c72d6990.
This commit is contained in:
Chris Forbes
2012-04-25 00:20:54 +12:00
parent 75c105cb85
commit cebf908bb2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Orders/UnitOrderGenerator.cs
View File

@@ -88,7 +88,7 @@ namespace OpenRA.Orders
var forceAttack = mi.Modifiers.HasModifier(Modifiers.Ctrl); var forceAttack = mi.Modifiers.HasModifier(Modifiers.Ctrl);
var forceQueue = mi.Modifiers.HasModifier(Modifiers.Shift); var forceQueue = mi.Modifiers.HasModifier(Modifiers.Shift);
string cursor = null; string cursor = null;
if( underCursor != null && !forceAttack ) if( underCursor != null )
if (o.Order.CanTargetActor(self, underCursor, forceAttack, forceQueue, ref cursor)) if (o.Order.CanTargetActor(self, underCursor, forceAttack, forceQueue, ref cursor))
return new UnitOrderResult( self, o.Order, o.Trait, cursor, Target.FromActor( underCursor ) ); return new UnitOrderResult( self, o.Order, o.Trait, cursor, Target.FromActor( underCursor ) );
if (o.Order.CanTargetLocation(self, xy, actorsAt, forceAttack, forceQueue, ref cursor)) if (o.Order.CanTargetLocation(self, xy, actorsAt, forceAttack, forceQueue, ref cursor))