thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-12 02:53:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

P_Ticker: Do not start position music or play noises if gametype has no time between intro and start

Browse source
This commit is contained in:
toaster 2023-06-03 14:18:01 +01:00
parent 3c505e2676
commit 5a3ed5464e
1 changed files with 35 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/p_tick.c
View file

@ -873,43 +873,47 @@ void P_Ticker(boolean run)
} }
else if (leveltime < starttime + TICRATE) else if (leveltime < starttime + TICRATE)
{ {
// Start countdown/music handling if (leveltime == (starttime + (TICRATE/2)))
if (leveltime == starttime-(3*TICRATE))
{
S_StartSound(NULL, sfx_s3ka7); // 3,
S_FadeMusic(0, 3500); //S_FadeOutStopMusic(3500); -- TODO the S_StopMusic callback can halt successor music instead
}
else if ((leveltime == starttime-(2*TICRATE)) || (leveltime == starttime-TICRATE))
{
S_StartSound(NULL, sfx_s3ka7); // 2, 1,
}
else if (leveltime == starttime)
{
S_StartSound(NULL, sfx_s3kad); // GO!
}
else if (leveltime == (starttime + (TICRATE/2)))
{ {
// Plays the music after the starting countdown. // Plays the music after the starting countdown.
S_ChangeMusic(mapmusname, mapmusflags, true); S_ChangeMusic(mapmusname, mapmusflags, true);
S_ShowMusicCredit(); S_ShowMusicCredit();
} }
else if (starttime != introtime)
{
// Start countdown/music handling
if (leveltime == starttime-(3*TICRATE))
{
S_StartSound(NULL, sfx_s3ka7); // 3,
S_FadeMusic(0, 3500); //S_FadeOutStopMusic(3500); -- TODO the S_StopMusic callback can halt successor music instead
}
else if ((leveltime == starttime-(2*TICRATE))
|| (leveltime == starttime-TICRATE))
{
S_StartSound(NULL, sfx_s3ka7); // 2, 1,
}
else if (leveltime == starttime)
{
S_StartSound(NULL, sfx_s3kad); // GO!
}
// POSITION!! music // POSITION!! music
if (encoremode) if (encoremode)
{ {
// Encore humming starts immediately. // Encore humming starts immediately.
if (leveltime == 1) if (leveltime == 1)
S_ChangeMusicInternal("encore", true); S_ChangeMusicInternal("encore", true);
} }
else else
{ {
// Plays the POSITION music after the camera spin // Plays the POSITION music after the camera spin
if (leveltime == introtime) if (leveltime == introtime)
S_ChangeMusicInternal( S_ChangeMusicInternal(
(mapheaderinfo[gamemap-1]->positionmus[0] (mapheaderinfo[gamemap-1]->positionmus[0]
? mapheaderinfo[gamemap-1]->positionmus ? mapheaderinfo[gamemap-1]->positionmus
: "postn" : "postn"
), true); ), true);
}
} }
} }