Healthier way of making the volume sliders work with cutsound

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index f28cba652d73f232d01505a0efc4c84063876bd4..ef386e39a75d0d9ec9f0352285c0fd39210da4ca 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -133,8 +133,6 @@ freelook 1
 sensitivity 6\r
 v_gamma 1.125000\r
 viewsize 100\r
-bgmvolume 1\r
-volume 0.5\r
 // fullscreen 1024x768x32bit\r
 vid_bitsperpixel 32\r
 vid_fullscreen 1\r
@@ -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"\r
 \r
 // part of an ugly hack for the menu audio sliders to work with the cutsound feature\r
-set menu_volume $volume\r
-set menu_bgmvolume $bgmvolume\r
+seta menu_volume 0.5\r
+seta menu_bgmvolume 1\r
+set volume $menu_volume\r
+set bgmvolume $menu_bgmvolume\r
 \r
 set sv_weaponstats_damagefile "" "when set to a file name, per-weapon damage stats get written to that file"\r
 set sv_weaponstats_killfile "" "when set to a file name, per-weapon kill stats get written to that file"\r

diff --git a/data/qcsrc/menu/voret/dialog_settings_audio.c b/data/qcsrc/menu/voret/dialog_settings_audio.c
index b96b05af77b97f0ac4d10fd1f93ce4fb2f0baeca..0fe76e2df7246ddc10aa32b5ed2a32f3369dfa62 100644 (file)
--- 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;\r
 \r
        me.TR(me);\r
-               s = makeVoretDecibelsSlider(-20, 0, 0.5, "bgmvolume");\r
+               s = makeVoretDecibelsSlider(-20, 0, 0.5, "menu_bgmvolume");\r
                me.TD(me, 1, 1, e = makeVoretSliderCheckBox(-1000000, 1, s, "Music:"));\r
                me.TD(me, 1, 2, s);\r
-               makeMulti(e, "menu_bgmvolume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature\r
-               makeMulti(s, "menu_bgmvolume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature\r
+               makeMulti(e, "bgmvolume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature\r
+               makeMulti(s, "bgmvolume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature\r
        me.TR(me);\r
        me.TR(me);\r
-               s = makeVoretDecibelsSlider(-20, 0, 0.5, "volume");\r
+               s = makeVoretDecibelsSlider(-20, 0, 0.5, "menu_volume");\r
                me.TD(me, 1, 1, e = makeVoretSliderCheckBox(-1000000, 1, s, "Master:"));\r
                me.TD(me, 1, 2, s);\r
-               makeMulti(e, "menu_volume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature\r
-               makeMulti(s, "menu_volume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature\r
+               makeMulti(e, "volume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature\r
+               makeMulti(s, "volume"); // part of an ugly hack for the menu audio sliders to work with the cutsound feature\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
                s = makeVoretDecibelsSlider(-20, 0, 0.5, "snd_staticvolume");\r