From 387a701db52260389758727e428dc6567053b855 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  | 25 ++++++++++++++++++-------
 src/s_sound.c |  6 +++---
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/d_main.c b/src/d_main.c
index 84d5a6f3..82f3721a 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1390,10 +1390,9 @@ void D_SRB2Main(void)
 		midi_disabled = true;
 #endif
 	}
-	if (M_CheckParm("-nosound"))
-		sound_disabled = true;
-	if (M_CheckParm("-nomusic")) // combines -nomidimusic and -nodigmusic
+	if (M_CheckParm("-noaudio")) // combines -nosound and -nomusic
 	{
+		sound_disabled = true;
 		digital_disabled = true;
 #ifndef NO_MIDI
 		midi_disabled = true;
@@ -1401,12 +1400,24 @@ void D_SRB2Main(void)
 	}
 	else
 	{
+		if (M_CheckParm("-nosound"))
+			sound_disabled = true;
+		if (M_CheckParm("-nomusic")) // combines -nomidimusic and -nodigmusic
+		{
+			digital_disabled = true;
 #ifndef NO_MIDI
-		if (M_CheckParm("-nomidimusic"))
-			midi_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
+			midi_disabled = true;
 #endif
-		if (M_CheckParm("-nodigmusic"))
-			digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
+		}
+		else
+		{
+#ifndef NO_MIDI
+			if (M_CheckParm("-nomidimusic"))
+				midi_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
+#endif
+			if (M_CheckParm("-nodigmusic"))
+				digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
+		}
 	}
 	if (!( sound_disabled && digital_disabled
 #ifndef NO_MIDI
diff --git a/src/s_sound.c b/src/s_sound.c
index 2ddffa3f..58cc0592 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -2182,7 +2182,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)
@@ -2196,7 +2196,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;
@@ -2239,7 +2239,7 @@ void GameDigiMusic_OnChange(void)
 #ifndef NO_MIDI
 void GameMIDIMusic_OnChange(void)
 {
-	if (M_CheckParm("-nomusic"))
+	if (M_CheckParm("-nomusic") || M_CheckParm("-noaudio"))
 		return;
 	else if (M_CheckParm("-nomidimusic"))
 		return;