thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-11 18:42:46 +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

18
src/p_tick.c
View file

@ -872,6 +872,14 @@ void P_Ticker(boolean run)
} }
} }
else if (leveltime < starttime + TICRATE) else if (leveltime < starttime + TICRATE)
{
if (leveltime == (starttime + (TICRATE/2)))
{
// Plays the music after the starting countdown.
S_ChangeMusic(mapmusname, mapmusflags, true);
S_ShowMusicCredit();
}
else if (starttime != introtime)
{ {
// Start countdown/music handling // Start countdown/music handling
if (leveltime == starttime-(3*TICRATE)) if (leveltime == starttime-(3*TICRATE))
@ -879,7 +887,8 @@ void P_Ticker(boolean run)
S_StartSound(NULL, sfx_s3ka7); // 3, S_StartSound(NULL, sfx_s3ka7); // 3,
S_FadeMusic(0, 3500); //S_FadeOutStopMusic(3500); -- TODO the S_StopMusic callback can halt successor music instead 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)) else if ((leveltime == starttime-(2*TICRATE))
|| (leveltime == starttime-TICRATE))
{ {
S_StartSound(NULL, sfx_s3ka7); // 2, 1, S_StartSound(NULL, sfx_s3ka7); // 2, 1,
} }
@ -887,12 +896,6 @@ void P_Ticker(boolean run)
{ {
S_StartSound(NULL, sfx_s3kad); // GO! S_StartSound(NULL, sfx_s3kad); // GO!
} }
else if (leveltime == (starttime + (TICRATE/2)))
{
// Plays the music after the starting countdown.
S_ChangeMusic(mapmusname, mapmusflags, true);
S_ShowMusicCredit();
}
// POSITION!! music // POSITION!! music
if (encoremode) if (encoremode)
@ -912,6 +915,7 @@ void P_Ticker(boolean run)
), true); ), true);
} }
} }
}
ps_lua_thinkframe_time = I_GetPreciseTime(); ps_lua_thinkframe_time = I_GetPreciseTime();
LUA_HookThinkFrame(); LUA_HookThinkFrame();