Merge branch 'master' into terencehill/vehicles_fixes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_settings_audio.c

diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c
index 174873fe7fc79f211a41d0321a1bae083b977e65..f3c27915e781206f53fe4543614ab741497fc3bf 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_audio.c
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.c
@@ -4,7 +4,7 @@ CLASS(XonoticAudioSettingsTab) EXTENDS(XonoticTab)
        ATTRIB(XonoticAudioSettingsTab, title, string, _("Audio"))
        ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticAudioSettingsTab, rows, float, 17)
-       ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2) // added extra .2 for center space 
+       ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2) // added extra .2 for center space
 ENDCLASS(XonoticAudioSettingsTab)
 entity makeXonoticAudioSettingsTab();
 #endif
@@ -23,92 +23,72 @@ void XonoticAudioSettingsTab_fill(entity me)
        entity e, s, sl;
 
        me.TR(me);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "mastervolume");
-               me.TD(me, 1, 1, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Master:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "mastervolume");
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Master:")));
                me.TD(me, 1, 2, s);
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "bgmvolume");
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "bgmvolume");
                makeMulti(s, "snd_channel8volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Music:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Music:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_staticvolume");
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_staticvolume");
                makeMulti(s, "snd_channel9volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, ZCTX(_("VOL^Ambient:"))));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, ZCTX(_("VOL^Ambient:"))));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel0volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Info:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel0volume");
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Info:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel3volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Items:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel3volume");
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Items:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel6volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Pain:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel6volume");
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Pain:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel7volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Player:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel7volume");
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Player:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel4volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Shots:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel4volume");
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Shots:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel2volume");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Voice:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel2volume");
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Voice:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-40, 0, 1, "snd_channel1volume");
+               s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel1volume");
                makeMulti(s, "snd_channel5volume"); // @!#%'n Tuba
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Weapons:")));
-               if(s.value != e.savedValue)
-                       e.savedValue = 0; // default
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Weapons:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
@@ -117,7 +97,7 @@ void XonoticAudioSettingsTab_fill(entity me)
                me.TD(me, 1, 3, makeXonoticCheckBox(0, "menu_snd_attenuation_method", _("New style sound attenuation")));
        me.TR(me);
                me.TD(me, 1, 3, makeXonoticCheckBox(0, "snd_mutewhenidle", _("Mute sounds when not active")));
-       
+
        me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
                me.TD(me, 1, 1, makeXonoticTextLabel(0, _("Frequency:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("snd_speed"));