Various fixes for menu

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

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index f72da7d2ea61ef89c34682064c2ac37eec573bc2..8ef2e9d6313b7b8e038e66b80f31e6ee2bd4f297 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -63,7 +63,8 @@ void XonoticEffectsSettingsTab_fill(entity me)
                me.TD(me, 1, 2, e = makeXonoticPicmipSlider());
                        if(cvar("developer"))
                                e.addValue(e, ZCTX(_("RES^Leet")), "1337");
-                       e.addValue(e, ZCTX(_("RES^Lowest")), "2");
+                       e.addValue(e, ZCTX(_("RES^Lowest")), "3");
+                       e.addValue(e, ZCTX(_("RES^Very low")), "2");
                        e.addValue(e, ZCTX(_("RES^Low")), "1");
                        e.addValue(e, ZCTX(_("RES^Normal")), "0");
                        e.addValue(e, ZCTX(_("RES^Good")), "-1");
@@ -102,6 +103,13 @@ void XonoticEffectsSettingsTab_fill(entity me)
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Particles distance:")));
                me.TD(me, 1, 2, e = makeXonoticSlider(500, 2000, 100, "r_drawparticles_drawdistance"));
        me.TR(me);
+       me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Damage effects:")));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_damageeffect"));
+                       e.addValue(e, ZCTX(_("DMGPRTCLS^Disabled")), "0");
+                       e.addValue(e, ZCTX(_("DMGPRTCLS^Skeletal")), "1");
+                       e.addValue(e, ZCTX(_("DMGPRTCLS^All")), "2");
+                       e.configureXonoticTextSliderValues(e);
+       me.TR(me);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "cl_decals", _("Decals")));
                me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "cl_decals_models", _("Decals on models")));
@@ -151,7 +159,7 @@ void XonoticEffectsSettingsTab_fill(entity me)
                me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping_lod", _("LOD")));
                        setDependentAND(e, "vid_gl20", 1, 1, "r_glsl_offsetmapping", 1, 1);
        me.TR(me);
-               me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "r_bloom", _("Bloom")));
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "r_bloom", _("Bloom")));
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_water", _("Reflections:")));
                        setDependent(e, "vid_gl20", 1, 1);
@@ -165,12 +173,11 @@ void XonoticEffectsSettingsTab_fill(entity me)
                s = makeXonoticSlider(0.1, 1, 0.1, "r_motionblur");
                me.TD(me, 1, 1, e = makeXonoticSliderCheckBox(0, 1, s, _("Motion blur:")));
                if(s.value != e.savedValue)
-                       e.savedValue = 0.5; // default
+                       e.savedValue = 0.4; // default
                me.TD(me, 1, 2, s);
        me.TR(me);
-               e = makeXonoticCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", _("Extra postprocessing effects"));
+               me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", _("Extra postprocessing effects")));
                makeMulti(e, "hud_powerup");
-               me.TD(me, 1, 2, e);
                setDependent(e, "vid_gl20", 1, 1);
                        
        me.gotoRC(me, me.rows - 1, 0);