hedgewars/uGears.pas
changeset 11914 c9bad8a01185
parent 11896 cb36d6df3814
child 11915 16ce211010cf
equal deleted inserted replaced
11913:232b57a70aca 11914:c9bad8a01185
   448         if (((CurrentHedgehog^.Gear^.State and gstAttacking) = 0)
   448         if (((CurrentHedgehog^.Gear^.State and gstAttacking) = 0)
   449             or (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking <> 0))
   449             or (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking <> 0))
   450             and (not(isInMultiShoot and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerInMultiShoot) <> 0))) then
   450             and (not(isInMultiShoot and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerInMultiShoot) <> 0))) then
   451             //(CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle])
   451             //(CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle])
   452                 begin
   452                 begin
   453                 if (TurnTimeLeft = 5000)
   453                 if (cHedgehogTurnTime >= 10000)
   454                 and (cHedgehogTurnTime >= 10000)
       
   455                 and (not PlacingHogs)
   454                 and (not PlacingHogs)
   456                 and (CurrentHedgehog^.Gear <> nil)
   455                 and (CurrentHedgehog^.Gear <> nil)
   457                 and ((CurrentHedgehog^.Gear^.State and gstAttacked) = 0) then
   456                 and ((CurrentHedgehog^.Gear^.State and gstAttacked) = 0) then
   458                     PlaySoundV(sndHurry, CurrentTeam^.voicepack);
   457                     if TurnTimeLeft = 5000 then
       
   458                         PlaySoundV(sndHurry, CurrentTeam^.voicepack)
       
   459                     else if TurnTimeLeft = 4000 then
       
   460                         PlaySound(sndCountdown4)
       
   461                     else if TurnTimeLeft = 3000 then
       
   462                         PlaySound(sndCountdown3)
       
   463                     else if TurnTimeLeft = 2000 then
       
   464                         PlaySound(sndCountdown2)
       
   465                     else if TurnTimeLeft = 1000 then
       
   466                         PlaySound(sndCountdown1);
   459             if ReadyTimeLeft > 0 then
   467             if ReadyTimeLeft > 0 then
   460                 begin
   468                 begin
   461                 if (ReadyTimeLeft = 2000) and (LastVoice.snd = sndNone) then
   469                 if (ReadyTimeLeft = 2000) and (LastVoice.snd = sndNone) then
   462                     AddVoice(sndComeonthen, CurrentTeam^.voicepack);
   470                     AddVoice(sndComeonthen, CurrentTeam^.voicepack);
   463                 dec(ReadyTimeLeft)
   471                 dec(ReadyTimeLeft)