# HG changeset patch # User nemo # Date 1246800302 0 # Node ID e009fee03c96e16e18accd0ff00a4eec9e7addd5 # Parent 2e98698b76aab67d14e9d8ee85ea1b02d9128bac allow attacks while moving on ammo with alt attack (parachute/rope/jetpack) - needs testing. diff -r 2e98698b76aa -r e009fee03c96 hedgewars/HHHandlers.inc --- a/hedgewars/HHHandlers.inc Fri Jul 03 23:45:07 2009 +0000 +++ b/hedgewars/HHHandlers.inc Sun Jul 05 13:25:02 2009 +0000 @@ -106,8 +106,11 @@ PHedgehog(Gear^.Hedgehog)^ do begin if ((State and gstHHDriven) <> 0)and - ((State and (gstAttacked or gstHHChooseTarget)) = 0)and - (((State and gstMoving) = 0) or ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_AttackInMove) <> 0))and + ((State and (gstAttacked or gstHHChooseTarget)) = 0) and + (((State and gstMoving) = 0) or + // Allow attacks while moving on ammo with AltAttack + ((CurAmmoGear <> nil) and ((CurAmmoGear^.Ammo^.Propz and ammoprop_AltAttack) <> 0)) or + ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_AltAttack) <> 0)) and ((TargetPoint.X <> NoPointX) or ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_NeedTarget) = 0)) then begin State:= State or gstAttacking;