Undo part of a previous commit, which broke automatic digestion. Need to do something...

[voretournament/voretournament.git] / data / qcsrc / menu / voret / dialog_settings_audio.c

diff --git a/data/qcsrc/menu/voret/dialog_settings_audio.c b/data/qcsrc/menu/voret/dialog_settings_audio.c
index 5eb38bbe4bcc9ca857f1a0c1091cb300ed97e5c4..516c6863464efb87e97ce59d4ba747df5551cc7c 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_audio.c
+++ b/data/qcsrc/menu/voret/dialog_settings_audio.c
@@ -3,7 +3,7 @@ CLASS(VoretAudioSettingsTab) EXTENDS(VoretTab)
        METHOD(VoretAudioSettingsTab, fill, void(entity))\r
        ATTRIB(VoretAudioSettingsTab, title, string, "Audio")\r
        ATTRIB(VoretAudioSettingsTab, intendedWidth, float, 0.9)\r
-       ATTRIB(VoretAudioSettingsTab, rows, float, 19)\r
+       ATTRIB(VoretAudioSettingsTab, rows, float, 20)\r
        ATTRIB(VoretAudioSettingsTab, columns, float, 6.5)\r
 ENDCLASS(VoretAudioSettingsTab)\r
 entity makeVoretAudioSettingsTab();\r
@@ -23,14 +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, "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, "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
@@ -95,6 +99,12 @@ void fillVoretAudioSettingsTab(entity me)
                setDependentStringNotEqual(e, "volume", "0");\r
                setDependentStringNotEqual(s, "volume", "0");\r
        me.TR(me);\r
+       me.TR(me);\r
+               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Prey sound cut:"));\r
+               me.TD(me, 1, 2, e = makeVoretSlider(0, 1, 0.05, "cl_vore_cutvolume_sound"));\r
+       me.TR(me);\r
+               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Prey music cut:"));\r
+               me.TD(me, 1, 2, e = makeVoretSlider(0, 1, 0.05, "cl_vore_cutvolume_music"));\r
 \r
        me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);\r
                me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Frequency:"));\r
@@ -165,6 +175,8 @@ void fillVoretAudioSettingsTab(entity me)
                        e.addValue(e, "5 minutes", "2");\r
                        e.addValue(e, "Both", "3");\r
                        e.configureVoretTextSliderValues(e);\r
+       me.TR(me);\r
+               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_helper", "Helper"));\r
        me.TR(me);\r
                me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_hitsound", "Hit indicator"));\r
        me.TR(me);\r