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

Clean up map start music logic

Browse source
This commit is contained in:
NepDisk 2026-03-10 21:25:04 -04:00
parent c6dbc2aea4
commit b9604e3fd6
1 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/p_tick.c
View file

@ -837,36 +837,39 @@ void P_Ticker(boolean run)
// Plays the music after the starting countdown.
else
{
// Change timing of start music based on gametypes[gametype]->rules
tic_t startingtime = (gametypes[gametype]->rules & GTR_NOCOUNTDOWN) ? introtime : starttime;
if (!(titlemapinaction == TITLEMAP_RUNNING))
{
if (!(gametypes[gametype]->rules & GTR_NOCOUNTDOWN))
if (leveltime == (startingtime + (TICRATE/2)))
{
if (leveltime == starttime-(3*TICRATE))
{
S_StartSound(NULL, sfx_s3ka7); // 3,
}
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!
}
// Plays the music after the starting countdown.
S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
S_ShowMusicCredit(0, 5*TICRATE, 0);
}
// Change timing of start music based on gametypes[gametype]->rules
else if (startingtime != introtime)
{
tic_t startingtime = (gametypes[gametype]->rules & GTR_NOCOUNTDOWN) ? introtime : starttime;
if (!(gametypes[gametype]->rules & GTR_NOCOUNTDOWN))
{
if (leveltime == startingtime-(3*TICRATE))
{
S_StartSound(NULL, sfx_s3ka7); // 3,
}
else if ((leveltime == startingtime-(2*TICRATE)) || (leveltime == starttime-TICRATE))
{
S_StartSound(NULL, sfx_s3ka7); // 2, 1,
}
else if (leveltime == startingtime)
{
S_StartSound(NULL, sfx_s3kad); // GO!
}
}
if (leveltime < startingtime) // SRB2Kart
S_ChangeMusicInternal(((grandprixinfo.roundnum > 0) ? "gpstrt" : (encoremode ? "estart" : "kstart")), false); // yes this will be spammed otherwise encore and some stuff WILL overwrite it
else if (leveltime == startingtime) // The GO! sound stops the level start ambience
S_StopMusic();
else if (leveltime == startingtime + (TICRATE/2)) // Plays the music after the starting countdown.
{
S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
S_ShowMusicCredit(0, 5*TICRATE, 0);
}
}
}
}