hedgewars/uGears.pas
changeset 9583 37a6d807c140
parent 9573 49bca2fabbd3
child 9651 c0a389ccb0c1
equal deleted inserted replaced
9581:eb35cc7ad9f0 9583:37a6d807c140
   419     end;
   419     end;
   420 
   420 
   421 if TurnTimeLeft > 0 then
   421 if TurnTimeLeft > 0 then
   422     if CurrentHedgehog^.Gear <> nil then
   422     if CurrentHedgehog^.Gear <> nil then
   423         if (((CurrentHedgehog^.Gear^.State and gstAttacking) = 0)
   423         if (((CurrentHedgehog^.Gear^.State and gstAttacking) = 0)
   424             or ((CurAmmoGear = nil) or ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking) <> 0)))
   424             or (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking <> 0))
   425             and not(isInMultiShoot and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerInMultiShoot) <> 0)) then
   425             and not(isInMultiShoot and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerInMultiShoot) <> 0)) then
   426             //(CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle])
   426             //(CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle])
   427                 begin
   427                 begin
   428                 if (TurnTimeLeft = 5000)
   428                 if (TurnTimeLeft = 5000)
   429                 and (cHedgehogTurnTime >= 10000)
   429                 and (cHedgehogTurnTime >= 10000)