GO! interupts the start ambience

This commit is contained in:
TehRealSalt 2018-06-29 20:15:42 -04:00
parent 9a9e1ad81e
commit 754a7daa99

View file

@ -3706,14 +3706,20 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
if ((leveltime == starttime-(3*TICRATE)) || (leveltime == starttime-(2*TICRATE)) || (leveltime == starttime-TICRATE)) if ((leveltime == starttime-(3*TICRATE)) || (leveltime == starttime-(2*TICRATE)) || (leveltime == starttime-TICRATE))
S_StartSound(NULL, sfx_s3ka7); S_StartSound(NULL, sfx_s3ka7);
if (leveltime == starttime) if (leveltime == starttime)
{
S_StartSound(NULL, sfx_s3kad); S_StartSound(NULL, sfx_s3kad);
S_StopMusic(); // The GO! sound stops the level start ambience
}
} }
// Start charging once you're given the opportunity. // Start charging once you're given the opportunity.
if (leveltime >= starttime-(2*TICRATE) && leveltime <= starttime && cmd->buttons & BT_ACCELERATE) if (leveltime >= starttime-(2*TICRATE) && leveltime <= starttime)
player->kartstuff[k_boostcharge]++; {
if (leveltime >= starttime-(2*TICRATE) && leveltime <= starttime && !(cmd->buttons & BT_ACCELERATE)) if (cmd->buttons & BT_ACCELERATE)
player->kartstuff[k_boostcharge] = 0; player->kartstuff[k_boostcharge]++;
else
player->kartstuff[k_boostcharge] = 0;
}
// Increase your size while charging your engine. // Increase your size while charging your engine.
if (leveltime < starttime+10) if (leveltime < starttime+10)