incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix encore music replacing start music

Browse source
This commit is contained in:
NepDisk 2024-10-21 23:14:22 -04:00
parent 8fc9f62698
commit 4cd76db297
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_tick.c
View file

@ -782,11 +782,17 @@ void P_Ticker(boolean run)
S_StartSound(NULL, sfx_s3kad); // GO! S_StartSound(NULL, sfx_s3kad); // GO!
} }
} }
if (leveltime == (starttime + (TICRATE/2)))
if (leveltime < starttime) // SRB2Kart
S_ChangeMusicInternal((encoremode ? "estart" : "kstart"), false); // yes this will be spammed otherwise encore and some stuff WILL overwrite it
else if (leveltime == starttime) // The GO! sound stops the level start ambience
S_StopMusic();
else if (leveltime == starttime + (TICRATE/2)) // Plays the music after the starting countdown.
{ {
S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0); S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
S_ShowMusicCredit(); S_ShowMusicCredit();
} }
} }
ps_lua_thinkframe_time = I_GetPreciseTime(); ps_lua_thinkframe_time = I_GetPreciseTime();