Apply nyov/effects

diff --git a/effects-high.cfg b/effects-high.cfg
index 48c8253a3a2146538f1a9dfa6cc388f76b616ba4..a514ce5cb67d9f2eb563ff8d4220d3a510ee61f7 100644 (file)
--- a/effects-high.cfg
+++ b/effects-high.cfg
@@ -5,7 +5,7 @@ cl_particles 1
 cl_particles_quality 1.0
 cl_damageeffect 1
 cl_spawn_point_particles 1
-cl_playerdetailreduction 4
+cl_playerdetailreduction 4.0
 gl_flashblend 0
 gl_picmip -1
 mod_q3bsp_nolightmaps 0

diff --git a/effects-low.cfg b/effects-low.cfg
index 91459c7b043af9561041d43b3c28b8ce00157815..b7e9a98a3a7a78fa396023d1f3fe615cd4cb4c4a 100644 (file)
--- a/effects-low.cfg
+++ b/effects-low.cfg
@@ -1,7 +1,7 @@
 cl_decals 1
 cl_decals_models 0
-cl_particles 1
 cl_decals_fadetime 2
+cl_particles 1
 cl_particles_quality 0.4
 cl_damageeffect 0
 cl_spawn_point_particles 0

diff --git a/effects-omg.cfg b/effects-omg.cfg
index 9e30a5fbd3982813dbb5675e01ad57a8a7e7cc88..9018ee2c94375ba8740fa35f3357f55ff1d3cf15 100644 (file)
--- a/effects-omg.cfg
+++ b/effects-omg.cfg
@@ -1,7 +1,7 @@
 cl_decals 0
 cl_decals_models 0
-cl_particles 1
 cl_decals_fadetime 2
+cl_particles 1
 cl_particles_quality 0.4
 cl_damageeffect 0
 cl_spawn_point_particles 0

diff --git a/effects-ultra.cfg b/effects-ultra.cfg
index 6095e189f522ef2ea69083b9781cd365ee8e08ea..5909f3b83dc956b18141d4c0111b251c60080813 100644 (file)
--- a/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@ -2,10 +2,10 @@ cl_decals 1
 cl_decals_models 0
 cl_decals_fadetime 10
 cl_particles 1
-cl_particles_quality 1
-cl_damageeffect 1
+cl_particles_quality 1.0
+cl_damageeffect 2
 cl_spawn_point_particles 1
-cl_playerdetailreduction 2
+cl_playerdetailreduction 0
 gl_flashblend 0
 gl_picmip -1
 mod_q3bsp_nolightmaps 0

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index 11cad9fa8881efdfe5569a1860a0d3935f25815c..bffb1d339b62a6e117049db054160c06a1356e9f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -144,7 +144,7 @@ void XonoticEffectsSettingsTab_fill(entity me)
                me.TDempty(me, 0.2);
            me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Time:")));
                setDependent(e, "cl_decals", 1, 1);
-           me.TD(me, 1, 2, e = makeXonoticSlider(1, 20, 1, "cl_decals_time"));
+               me.TD(me, 1, 2, e = makeXonoticSlider(1, 20, 1, "cl_decals_fadetime"));
                setDependent(e, "cl_decals", 1, 1);
 
        me.gotoRC(me, 1.25, 3.2); me.setFirstColumn(me, me.currentColumn);