hedgewars/uGears.pas
branchwebgl
changeset 9954 bf51bc7e2808
parent 9950 2759212a27de
child 9968 7fb2f35bdd5b
equal deleted inserted replaced
9952:32f5982604f4 9954:bf51bc7e2808
   422 
   422 
   423 if TurnTimeLeft > 0 then
   423 if TurnTimeLeft > 0 then
   424     if CurrentHedgehog^.Gear <> nil then
   424     if CurrentHedgehog^.Gear <> nil then
   425         if (((CurrentHedgehog^.Gear^.State and gstAttacking) = 0)
   425         if (((CurrentHedgehog^.Gear^.State and gstAttacking) = 0)
   426             or (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking <> 0))
   426             or (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking <> 0))
   427             and not(isInMultiShoot and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerInMultiShoot) <> 0)) then
   427             and (not(isInMultiShoot and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerInMultiShoot) <> 0))) then
   428             //(CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle])
   428             //(CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle])
   429                 begin
   429                 begin
   430                 if (TurnTimeLeft = 5000)
   430                 if (TurnTimeLeft = 5000)
   431                 and (cHedgehogTurnTime >= 10000)
   431                 and (cHedgehogTurnTime >= 10000)
   432                 and (not PlacingHogs)
   432                 and (not PlacingHogs)