From 53918351a85fe87d9ca7e1a617f6ab95c0dbbb99 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 28 Feb 2011 19:36:44 +0200
Subject: [PATCH] Healthier way of making the volume sliders work with cutsound

---
 data/defaultVoretournament.cfg                |  8 ++++----
 data/qcsrc/menu/voret/dialog_settings_audio.c | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index f28cba65..ef386e39 100644
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -133,8 +133,6 @@ freelook 1
 sensitivity 6
 v_gamma 1.125000
 viewsize 100
-bgmvolume 1
-volume 0.5
 // fullscreen 1024x768x32bit
 vid_bitsperpixel 32
 vid_fullscreen 1
@@ -1538,8 +1536,10 @@ set g_vore_regurgitatecolor_digest "0.15 0.25 0" "the color players will have wh
 set g_vore_keepdeadprey 1 "If enabled, prey remains inside the stomach after dying from digestion, else the predator throws up their dead body"
 
 // part of an ugly hack for the menu audio sliders to work with the cutsound feature
-set menu_volume $volume
-set menu_bgmvolume $bgmvolume
+seta menu_volume 0.5
+seta menu_bgmvolume 1
+set volume $menu_volume
+set bgmvolume $menu_bgmvolume
 
 set sv_weaponstats_damagefile "" "when set to a file name, per-weapon damage stats get written to that file"
 set sv_weaponstats_killfile "" "when set to a file name, per-weapon kill stats get written to that file"
diff --git a/data/qcsrc/menu/voret/dialog_settings_audio.c b/data/qcsrc/menu/voret/dialog_settings_audio.c
index b96b05af..0fe76e2d 100644
--- a/data/qcsrc/menu/voret/dialog_settings_audio.c
+++ b/data/qcsrc/menu/voret/dialog_settings_audio.c
@@ -23,18 +23,18 @@ void fillVoretAudioSettingsTab(entity me)
 	entity e, s, sl;
 
 	me.TR(me);
-		s = makeVoretDecibelsSlider(-20, 0, 0.5, "bgmvolume");
+		s = makeVoretDecibelsSlider(-20, 0, 0.5, "menu_bgmvolume");
 		me.TD(me, 1, 1, e = makeVoretSliderCheckBox(-1000000, 1, s, "Music:"));
 		me.TD(me, 1, 2, s);
-		makeMulti(e, "menu_bgmvolume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature
-		makeMulti(s, "menu_bgmvolume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature
+		makeMulti(e, "bgmvolume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature
+		makeMulti(s, "bgmvolume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature
 	me.TR(me);
 	me.TR(me);
-		s = makeVoretDecibelsSlider(-20, 0, 0.5, "volume");
+		s = makeVoretDecibelsSlider(-20, 0, 0.5, "menu_volume");
 		me.TD(me, 1, 1, e = makeVoretSliderCheckBox(-1000000, 1, s, "Master:"));
 		me.TD(me, 1, 2, s);
-		makeMulti(e, "menu_volume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature
-		makeMulti(s, "menu_volume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature
+		makeMulti(e, "volume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature
+		makeMulti(s, "volume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeVoretDecibelsSlider(-20, 0, 0.5, "snd_staticvolume");
-- 
2.39.2