From 39baca89d3707077aa243f4f66c30cf0a2b4cfea Mon Sep 17 00:00:00 2001
From: james <justsomejames2@gmail.com>
Date: Wed, 6 Feb 2019 17:24:13 -0800
Subject: [PATCH] Do not start sound system when disabled
---
src/d_main.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/d_main.c b/src/d_main.c
index 68eb7cc776..41fa98408b 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -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();
--
GitLab