Cleanup audio tab a little bit

diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c
index 8d51e3151a3b826a9a55151d8074bdb11965ca95..6985fe352408754dd74d021564ce14008b4f6a54 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_audio.c
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.c
@@ -20,7 +20,7 @@ entity makeXonoticAudioSettingsTab()
 
 void XonoticAudioSettingsTab_fill(entity me)
 {
-       entity e, s, sl;
+       entity e, s;
 
        me.TR(me);
                s = makeXonoticDecibelsSlider(-40, 0, 0.4, "mastervolume");
@@ -123,9 +123,11 @@ void XonoticAudioSettingsTab_fill(entity me)
                        e.addValue(e, _("7.1"), "8");
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
-               me.TD(me, 1, 1.2, e = makeXonoticCheckBox(0, "snd_swapstereo", _("Swap Stereo"))); // TODO: remove from inline
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "snd_swapstereo", _("Swap stereo output channels")));
                setDependent(e, "snd_channels", 1.5, 0.5);
-               me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "snd_spatialization_control", _("Headphone friendly mode")));
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "snd_spatialization_control", _("Headphone friendly mode")));
                setDependent(e, "snd_channels", 1.5, 0.5);
        me.TR(me);
        me.TR(me);
@@ -144,17 +146,13 @@ void XonoticAudioSettingsTab_fill(entity me)
                        e.addValue(e, ZCTX(_("WRN^Both")), "3");
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
-       me.TR(me);
-               sl = makeXonoticSlider(0.15, 1, 0.05, "cl_autotaunt");
-                       sl.valueDisplayMultiplier = 100;
-                       sl.valueDigits = 0;
-               me.TD(me, 1, 3, e = makeXonoticSliderCheckBox(0, 1, sl, _("Automatic taunts"))); // TODO
-               if(sl.value != e.savedValue)
-                       e.savedValue = 0.65; // default
-       me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, makeXonoticTextLabel(0, _("Frequency:")));
-               me.TD(me, 1, 2, sl);
+               me.TD(me, 1, 1, makeXonoticTextLabel(0, _("Automatic taunts:")));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_autotaunt"));
+                       e.addValue(e, _("Never"), "0");
+                       e.addValue(e, _("Sometimes"), "0.35");
+                       e.addValue(e, _("Often"), "0.65");
+                       e.addValue(e, _("Always"), "1");
+                       e.configureXonoticTextSliderValues(e);
        me.TR(me);
        me.TR(me);
                if(cvar("developer"))