vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Menu sound toggle fixes (and add starpost sfx to menu)

Browse source
This commit is contained in:
mazmazz 2018-09-14 11:10:38 -04:00
parent 4b1bc53db1
commit 691de18fbb
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/m_menu.c
View file

@ -6954,23 +6954,15 @@ static void M_ToggleSFX(void)
{ {
sound_disabled = false; sound_disabled = false;
I_StartupSound(); I_StartupSound();
if (sound_disabled) return;
S_InitSfxChannels(cv_soundvolume.value); S_InitSfxChannels(cv_soundvolume.value);
S_StartSound(NULL, sfx_strpst);
M_StartMessage(M_GetText("SFX Enabled\n"), NULL, MM_NOTHING); M_StartMessage(M_GetText("SFX Enabled\n"), NULL, MM_NOTHING);
} }
else else
{ {
if (sound_disabled) sound_disabled = true;
{ S_StopSounds();
sound_disabled = false; M_StartMessage(M_GetText("SFX Disabled\n"), NULL, MM_NOTHING);
M_StartMessage(M_GetText("SFX Enabled\n"), NULL, MM_NOTHING);
}
else
{
sound_disabled = true;
S_StopSounds();
M_StartMessage(M_GetText("SFX Disabled\n"), NULL, MM_NOTHING);
}
} }
} }
@ -6980,7 +6972,6 @@ static void M_ToggleDigital(void)
{ {
digital_disabled = false; digital_disabled = false;
I_InitMusic(); I_InitMusic();
if (digital_disabled) return;
S_StopMusic(); S_StopMusic();
if (Playing()) if (Playing())
P_RestoreMusic(&players[consoleplayer]); P_RestoreMusic(&players[consoleplayer]);
@ -7020,7 +7011,6 @@ static void M_ToggleMIDI(void)
{ {
midi_disabled = false; midi_disabled = false;
I_InitMusic(); I_InitMusic();
if (midi_disabled) return;
if (Playing()) if (Playing())
P_RestoreMusic(&players[consoleplayer]); P_RestoreMusic(&players[consoleplayer]);
else else