Skip to content
Snippets Groups Projects
Commit 39baca89 authored by James R.'s avatar James R. Committed by James R.
Browse files

Do not start sound system when disabled

parent 923f43f8
No related branches found
No related tags found
No related merge requests found
......@@ -1244,10 +1244,6 @@ void D_SRB2Main(void)
sound_disabled = true;
midi_disabled = digital_disabled = true;
}
else
{
CONS_Printf("S_InitSfxChannels(): Setting up sound channels.\n");
}
if (M_CheckParm("-noaudio")) // combines -nosound and -nomusic
{
sound_disabled = true;
......@@ -1271,9 +1267,17 @@ void D_SRB2Main(void)
digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
}
}
I_StartupSound();
I_InitMusic();
S_InitSfxChannels(cv_soundvolume.value);
if (!( sound_disabled && digital_disabled
#ifndef NO_MIDI
&& midi_disabled
#endif
))
{
CONS_Printf("S_InitSfxChannels(): Setting up sound channels.\n");
I_StartupSound();
I_InitMusic();
S_InitSfxChannels(cv_soundvolume.value);
}
CONS_Printf("ST_Init(): Init status bar.\n");
ST_Init();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment