hedgewars/uGears.pas
changeset 9573 49bca2fabbd3
parent 9497 1813b682c6bd
child 9583 37a6d807c140
--- a/hedgewars/uGears.pas	Wed Oct 23 12:46:29 2013 -0400
+++ b/hedgewars/uGears.pas	Wed Oct 23 22:25:17 2013 +0400
@@ -420,8 +420,10 @@
 
 if TurnTimeLeft > 0 then
     if CurrentHedgehog^.Gear <> nil then
-        if ((CurrentHedgehog^.Gear^.State and gstAttacking) = 0) and
-            not(isInMultiShoot and (CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle])) then
+        if (((CurrentHedgehog^.Gear^.State and gstAttacking) = 0)
+            or ((CurAmmoGear = nil) or ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking) <> 0)))
+            and not(isInMultiShoot and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerInMultiShoot) <> 0)) then
+            //(CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle])
                 begin
                 if (TurnTimeLeft = 5000)
                 and (cHedgehogTurnTime >= 10000)