hedgewars/uGears.pas
changeset 10078 8572d1f8b2f0
parent 10015 4feced261c68
child 10105 8c5fa1d15bd5
equal deleted inserted replaced
10077:ca67740f19b2 10078:8572d1f8b2f0
   423 
   423 
   424 if TurnTimeLeft > 0 then
   424 if TurnTimeLeft > 0 then
   425     if CurrentHedgehog^.Gear <> nil then
   425     if CurrentHedgehog^.Gear <> nil then
   426         if (((CurrentHedgehog^.Gear^.State and gstAttacking) = 0)
   426         if (((CurrentHedgehog^.Gear^.State and gstAttacking) = 0)
   427             or (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking <> 0))
   427             or (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking <> 0))
   428             and not(isInMultiShoot and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerInMultiShoot) <> 0)) then
   428             and (not(isInMultiShoot and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerInMultiShoot) <> 0))) then
   429             //(CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle])
   429             //(CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle])
   430                 begin
   430                 begin
   431                 if (TurnTimeLeft = 5000)
   431                 if (TurnTimeLeft = 5000)
   432                 and (cHedgehogTurnTime >= 10000)
   432                 and (cHedgehogTurnTime >= 10000)
   433                 and (not PlacingHogs)
   433                 and (not PlacingHogs)