Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
not sure why this nil check is in here
authornemo
Sun, 27 Oct 2013 22:34:25 -0400
changeset 9583 37a6d807c140
parent 9581 eb35cc7ad9f0
child 9648 3a3defce1b28
not sure why this nil check is in here
hedgewars/uGears.pas file | annotate | diff | comparison | revisions 
--- 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
hedgewars