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

Don't call I_StartupSound in SFX toggle

Browse source 
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call

(cherry picked from commit b330dc2394)
This commit is contained in:
mazmazz 2018-09-14 16:39:10 -04:00
parent 4a5bcf43a2
commit 3a343cf8f1
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_netcmd.c
View file

@ -4049,6 +4049,7 @@ static void Command_RestartAudio_f(void)
return;
S_StopMusic();
S_StopSounds();
I_ShutdownMusic();
I_ShutdownSound();
I_StartupSound();

1
src/m_menu.c
View file

@ -9419,7 +9419,6 @@ static void M_ToggleSFX(INT32 choice)
if (sound_disabled)
{
sound_disabled = false;
I_StartupSound();
S_InitSfxChannels(cv_soundvolume.value);
S_StartSound(NULL, sfx_strpst);
OP_SoundOptionsMenu[6].status = IT_STRING | IT_CVAR;

5
src/sdl/mixer_sound.c
View file

@ -82,7 +82,10 @@ void I_StartupSound(void)
// EE inits audio first so we're following along.
if (SDL_WasInit(SDL_INIT_AUDIO) == SDL_INIT_AUDIO)
CONS_Printf("SDL Audio already started\n");
{
CONS_Debug(DBG_DETAILED, "SDL Audio already started\n");
return;
}
else if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
{
CONS_Alert(CONS_ERROR, "Error initializing SDL Audio: %s\n", SDL_GetError());