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

Prevent music linedefexec specials from overriding intro music

Browse source 
Ugly hack for now, should properly be fixed later.
This commit is contained in:
NepDisk 2026-03-10 21:39:27 -04:00
parent b9604e3fd6
commit 329337b36d
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/p_spec.c
View file

@ -2971,19 +2971,26 @@ boolean P_ProcessSpecial(activator_t *activator, INT16 special, INT32 *args, cha
mapmusposition = position;
mapmusresume = 0;
S_ChangeMusicEx(mapmusname, mapmusflags, !(args[0] & TMM_NOLOOP), position,
!(args[0] & TMM_FADE) ? prefadems : 0,
!(args[0] & TMM_FADE) ? postfadems : 0);
// FIXME HACK: Don't play music before the countdown music stops. Please properly fix this later.
// Change timing of start music based on gametypes[gametype]->rules
tic_t startingtime = (gametypes[gametype]->rules & GTR_NOCOUNTDOWN) ? introtime : starttime;
if (!(args[0] & TMM_NOCREDIT))
S_ShowMusicCredit(0, 5*TICRATE, 0);
if ((args[0] & TMM_FADE) && fadetarget)
if (leveltime >= (startingtime + (TICRATE/2)))
{
if (!postfadems)
S_SetInternalMusicVolume(fadetarget);
else
S_FadeMusicFromVolume(fadetarget, fadesource, postfadems);
S_ChangeMusicEx(mapmusname, mapmusflags, !(args[0] & TMM_NOLOOP), position,
!(args[0] & TMM_FADE) ? prefadems : 0,
!(args[0] & TMM_FADE) ? postfadems : 0);
if (!(args[0] & TMM_NOCREDIT))
S_ShowMusicCredit(0, 5*TICRATE, 0);
if ((args[0] & TMM_FADE) && fadetarget)
{
if (!postfadems)
S_SetInternalMusicVolume(fadetarget);
else
S_FadeMusicFromVolume(fadetarget, fadesource, postfadems);
}
}
}