- fixed handling of music in Redneck Rampage and Shadow Warrior.

After merging the CD enabling CVAR they had the same default (off) as Blood which is wrong.
This also addresses other music related issues, like not properly cycling through the RR music.
This commit is contained in:
Christoph Oelckers 2019-12-26 13:04:29 +01:00
parent c8edef4e0c
commit d8dfe752b5
14 changed files with 59 additions and 35 deletions

View file

@ -2000,7 +2000,7 @@ void G_BonusScreen(int32_t bonusonly)
videoClearScreen(0);
G_DisplayMPResultsScreen();
if (MusicEnabled())
if (MusicEnabled() && mus_enabled)
S_PlaySound(BONUSMUSIC);
videoNextPage();
@ -2042,7 +2042,7 @@ void G_BonusScreen(int32_t bonusonly)
gametext_center_shade(192, GStrings("PRESSKEY"), quotepulseshade);
if (MusicEnabled())
if (MusicEnabled() && mus_enabled)
S_PlaySound(BONUSMUSIC);
}
else
@ -2579,7 +2579,7 @@ void G_BonusScreenRRRA(int32_t bonusonly)
videoClearScreen(0);
G_DisplayMPResultsScreen();
if (MusicEnabled())
if (MusicEnabled() && mus_enabled)
S_PlaySound(BONUSMUSIC);
videoNextPage();