Merge remote branch 'origin/master' into mirceakitsune/damage_effects

[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 8c779bb6ebb794089aaa98f13885045f66b45dba..4e5a9088cbdbeeef67b27407dd343a97ccbc3846 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -109,18 +109,19 @@ void XonoticEffectsSettingsTab_fill(entity me)
                        e.addValue(e, _("16x"), "16");
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
-       me.TR(me);
-               me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Damage effects:")));
-               me.TD(me, 1, 0.75, e = makeXonoticRadioButton(1, "cl_damageeffect", "0", (_("Disabled"))));
-               me.TD(me, 1, 0.75, e = makeXonoticRadioButton(1, "cl_damageeffect", "1", _("Skeletal meshes")));
-               me.TD(me, 1, 0.75, e = makeXonoticRadioButton(1, "cl_damageeffect", "2", _("All meshes")));
        me.TR(me);
                me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Particle quality:")));
-               me.TD(me, 1, 1.9, e = makeXonoticSlider(0.2, 1.0, 0.1, "cl_particles_quality"));
+               me.TD(me, 1, 2, e = makeXonoticSlider(0.2, 1.0, 0.1, "cl_particles_quality"));
        me.TR(me);
                me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Particle distance:")));
-               me.TD(me, 1, 1.9, e = makeXonoticSlider(500, 2000, 100, "r_drawparticles_drawdistance"));
+               me.TD(me, 1, 2, e = makeXonoticSlider(500, 2000, 100, "r_drawparticles_drawdistance"));
        me.TR(me);
+       me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Damage effects:")));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_damageeffect"));
+                       e.addValue(e, _("Disabled"), "0");
+                       e.addValue(e, _("Skeletal"), "1");
+                       e.addValue(e, _("All"), "2");
+                       e.configureXonoticTextSliderValues(e);
        me.TR(me);
                me.TD(me, 1, 1.5, e = makeXonoticCheckBox(0, "cl_decals", _("Decals")));
                me.TD(me, 1, 1.5, e = makeXonoticCheckBox(0, "cl_decals_models", _("Decals on models")));