From a24814c2fca51adedc1c562ce2464ab6cccf2f9e Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 18 Apr 2019 23:50:29 -0700
Subject: [PATCH] Add a "-noaudio" parm to cover "-nomusic" and "-nosound"
---
src/d_main.c | 26 +++++++++++++++++++-------
src/s_sound.c | 6 +++---
2 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/d_main.c b/src/d_main.c
index 37637edd60..68eb7cc776 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1248,16 +1248,28 @@ void D_SRB2Main(void)
{
CONS_Printf("S_InitSfxChannels(): Setting up sound channels.\n");
}
- if (M_CheckParm("-nosound"))
+ if (M_CheckParm("-noaudio")) // combines -nosound and -nomusic
+ {
sound_disabled = true;
- if (M_CheckParm("-nomusic")) // combines -nomidimusic and -nodigmusic
- midi_disabled = digital_disabled = true;
+ digital_disabled = true;
+ midi_disabled = true;
+ }
else
{
- if (M_CheckParm("-nomidimusic"))
- midi_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
- if (M_CheckParm("-nodigmusic"))
- digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
+ if (M_CheckParm("-nosound"))
+ sound_disabled = true;
+ if (M_CheckParm("-nomusic")) // combines -nomidimusic and -nodigmusic
+ {
+ digital_disabled = true;
+ midi_disabled = true;
+ }
+ else
+ {
+ if (M_CheckParm("-nomidimusic"))
+ midi_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
+ if (M_CheckParm("-nodigmusic"))
+ digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
+ }
}
I_StartupSound();
I_InitMusic();
diff --git a/src/s_sound.c b/src/s_sound.c
index 299e4b8897..1a719d9725 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -2202,7 +2202,7 @@ static void Command_RestartAudio_f(void)
void GameSounds_OnChange(void)
{
- if (M_CheckParm("-nosound"))
+ if (M_CheckParm("-nosound") || M_CheckParm("-noaudio"))
return;
if (sound_disabled)
@@ -2220,7 +2220,7 @@ void GameSounds_OnChange(void)
void GameDigiMusic_OnChange(void)
{
- if (M_CheckParm("-nomusic"))
+ if (M_CheckParm("-nomusic") || M_CheckParm("-noaudio"))
return;
else if (M_CheckParm("-nodigmusic"))
return;
@@ -2262,7 +2262,7 @@ void GameDigiMusic_OnChange(void)
void GameMIDIMusic_OnChange(void)
{
- if (M_CheckParm("-nomusic"))
+ if (M_CheckParm("-nomusic") || M_CheckParm("-noaudio"))
return;
else if (M_CheckParm("-nomidimusic"))
return;
--
GitLab