# HG changeset patch # User nemo # Date 1382927665 14400 # Node ID 37a6d807c1408aacf4b46ec35e1dedab86451251 # Parent eb35cc7ad9f0a87d86b891fc1b43a7019c6ea622 not sure why this nil check is in here diff -r eb35cc7ad9f0 -r 37a6d807c140 hedgewars/uGears.pas --- a/hedgewars/uGears.pas Sun Oct 27 00:39:06 2013 +0400 +++ b/hedgewars/uGears.pas Sun Oct 27 22:34:25 2013 -0400 @@ -421,7 +421,7 @@ if TurnTimeLeft > 0 then if CurrentHedgehog^.Gear <> nil then if (((CurrentHedgehog^.Gear^.State and gstAttacking) = 0) - or ((CurAmmoGear = nil) or ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking) <> 0))) + 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