stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-22 01:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed post-boss music change with mapmusname comparison

Browse source
This commit is contained in:
mazmazz 2018-08-25 22:18:11 -04:00
parent c82a5de4b7
commit 0f42363a97
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_enemy.c
View file

@ -3534,6 +3534,7 @@ void A_BossDeath(mobj_t *mo)
{ {
// Touching the egg trap button calls P_DoPlayerExit, which calls P_RestoreMusic. // Touching the egg trap button calls P_DoPlayerExit, which calls P_RestoreMusic.
// So just park ourselves in the mapmus variables. // So just park ourselves in the mapmus variables.
boolean changed = (boolean)strnicmp(mapheaderinfo[gamemap-1]->musname, mapmusname, 7);
strncpy(mapmusname, mapheaderinfo[gamemap-1]->muspostbossname, 7); strncpy(mapmusname, mapheaderinfo[gamemap-1]->muspostbossname, 7);
mapmusname[6] = 0; mapmusname[6] = 0;
mapmusflags = (mapheaderinfo[gamemap-1]->muspostbosstrack & MUSIC_TRACKMASK) | MUSIC_RELOADRESET; mapmusflags = (mapheaderinfo[gamemap-1]->muspostbosstrack & MUSIC_TRACKMASK) | MUSIC_RELOADRESET;
@ -3541,7 +3542,7 @@ void A_BossDeath(mobj_t *mo)
// don't change if we're in another tune // don't change if we're in another tune
// but in case we're in jingle, use our parked mapmus variables so the correct track restores // but in case we're in jingle, use our parked mapmus variables so the correct track restores
if (!strnicmp(mapheaderinfo[gamemap-1]->musname, mapmusname, 7)) if (!changed)
S_ChangeMusicAdvanced(mapmusname, mapmusflags, true, mapmusposition, (1*MUSICRATE)+(MUSICRATE/2), 0); S_ChangeMusicAdvanced(mapmusname, mapmusflags, true, mapmusposition, (1*MUSICRATE)+(MUSICRATE/2), 0);
} }
} }