--- a/hedgewars/uGears.pas Sat Nov 19 15:00:14 2016 +0100
+++ b/hedgewars/uGears.pas Sat Apr 30 23:30:34 2016 +0200
@@ -446,7 +446,8 @@
if TurnTimeLeft > 0 then
if CurrentHedgehog^.Gear <> nil then
if (((CurrentHedgehog^.Gear^.State and gstAttacking) = 0)
- or (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking <> 0))
+ or (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking <> 0)
+ or ((GameFlags and gfInfAttack) <> 0) and (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttackingInInfAttackMode <> 0))
and (not(isInMultiShoot and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerInMultiShoot) <> 0))) then
//(CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle])
begin