From 62fd8a49c1ca3763f86a8b9badf18b4d2b5b0e4e Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Fri, 3 Jan 2020 00:47:13 +0100
Subject: [PATCH] - fixed CVAR assignment for number of sound channels.

---
 source/common/gamecvars.cpp      | 12 ------------
 wadsrc/static/engine/menudef.txt |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/source/common/gamecvars.cpp b/source/common/gamecvars.cpp
index 3be788484..e2fa4219f 100644
--- a/source/common/gamecvars.cpp
+++ b/source/common/gamecvars.cpp
@@ -148,18 +148,6 @@ CUSTOM_CVARD(Int, snd_mixrate, 44100, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "sound mix
 	else if (self > 48000) self = 48000;
 }
 
-CUSTOM_CVARD(Int, snd_numchannels, 2, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "the number of sound channels")
-{
-	if (self < 1) self = 1;
-	else if (self > 2) self = 2;
-}
-
-CUSTOM_CVARD(Int, snd_numvoices, 64, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "the number of concurrent sounds")
-{
-	if (self < 8) self = 8;
-	else if (self > 128) self = 128;
-}
-
 CUSTOM_CVARD(Int, snd_speech, 5, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "enables/disables player speech")
 {
 	if (self < 0) self = 0;
diff --git a/wadsrc/static/engine/menudef.txt b/wadsrc/static/engine/menudef.txt
index cafcea969..753e00ad1 100644
--- a/wadsrc/static/engine/menudef.txt
+++ b/wadsrc/static/engine/menudef.txt
@@ -1316,7 +1316,7 @@ OptionMenu SoundOptions //protected
 	Option "$SNDMNU_MIDIDEVICE",		"snd_mididevice", "MidiDevices"
 	StaticText " "
 	//Option "$SNDMNU_UNDERWATERREVERB",	"snd_waterreverb", "OnOff"
-	Slider "$SNDMNU_CHANNELS",			"snd_numchannels", 64, 128, 8, 0
+	Slider "$SNDMNU_CHANNELS",			"snd_channels", 64, 128, 8, 0
 	staticText ""
 	ifgame (Blood, ShadowWarrior, Redneck, RedneckRides)
 	{