Do not start sound system when disabled
This commit is contained in:
parent
923f43f887
commit
39baca89d3
18
src/d_main.c
18
src/d_main.c
|
@ -1244,10 +1244,6 @@ void D_SRB2Main(void)
|
||||||
sound_disabled = true;
|
sound_disabled = true;
|
||||||
midi_disabled = digital_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
|
if (M_CheckParm("-noaudio")) // combines -nosound and -nomusic
|
||||||
{
|
{
|
||||||
sound_disabled = true;
|
sound_disabled = true;
|
||||||
|
@ -1271,9 +1267,17 @@ void D_SRB2Main(void)
|
||||||
digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
|
digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
I_StartupSound();
|
if (!( sound_disabled && digital_disabled
|
||||||
I_InitMusic();
|
#ifndef NO_MIDI
|
||||||
S_InitSfxChannels(cv_soundvolume.value);
|
&& 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");
|
CONS_Printf("ST_Init(): Init status bar.\n");
|
||||||
ST_Init();
|
ST_Init();
|
||||||
|
|
Loading…
Reference in a new issue