Set decal time to 1 and use fadetime in configs

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 2c048b39eac92ecebba09fbd6006e7623a6ca201..1c6953d8a12069aa0e32573daef19556f0be4064 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -544,7 +544,7 @@ r_mipsprites 1
 r_mipskins 1
 r_shadow_realtime_world_lightmaps 1
 cl_decals_fadetime 5
-cl_decals_time 2
+cl_decals_time 1
 seta cl_gunalign 3 "Gun alignment; 1 = center (if allowed by g_shootfromclient) or right, 2 = center (if allowed by g_shootfromclient) or left, 3 = right only, 4 = left only"
 seta cl_nogibs 0 "reduce number of violence effects, or remove them totally"
 seta cl_particlegibs 0 "simpler gibs"

diff --git a/effects-low.cfg b/effects-low.cfg
index 8d6e72a4d0b043a45531383ebe07b99b8828ec92..5e7cec3a2fdd9fb23c3dc39c112904a2de8bf499 100644 (file)
--- a/effects-low.cfg
+++ b/effects-low.cfg
@@ -1,6 +1,6 @@
 cl_decals 1
 cl_decals_models 0
-cl_decals_time 2
+cl_decals_fadetime 2
 cl_particles_quality 0.4
 cl_damageeffect 0
 cl_spawn_point_particles 0

diff --git a/effects-med.cfg b/effects-med.cfg
index 1611943c64323588e9e53b057346194149423c82..fb05527d7f7f74c390fd06b4c95ff86643f36a50 100644 (file)
--- a/effects-med.cfg
+++ b/effects-med.cfg
@@ -1,6 +1,6 @@
 cl_decals 1
 cl_decals_models 0
-cl_decals_time 2
+cl_decals_fadetime 2
 cl_particles_quality 1
 cl_damageeffect 0
 cl_spawn_point_particles 0

diff --git a/effects-normal.cfg b/effects-normal.cfg
index 064af655007dabaf85825570d73287d843eb917a..40075a8530b9b3f4339fbfed06e2c78d3d108621 100644 (file)
--- a/effects-normal.cfg
+++ b/effects-normal.cfg
@@ -1,6 +1,6 @@
 cl_decals 1
 cl_decals_models 0
-cl_decals_time 2
+cl_decals_fadetime 2
 cl_particles_quality 1
 cl_damageeffect 1
 cl_spawn_point_particles 1

diff --git a/effects-omg.cfg b/effects-omg.cfg
index 9ede9c7d7236cbd8cb66ddf25d6dcc8900db39d4..7c39fbbef6335d8467d2747f119c9b96ab4421cd 100644 (file)
--- a/effects-omg.cfg
+++ b/effects-omg.cfg
@@ -1,6 +1,6 @@
 cl_decals 0
 cl_decals_models 0
-cl_decals_time 2
+cl_decals_fadetime 2
 cl_particles_quality 0.4
 cl_damageeffect 0
 cl_spawn_point_particles 0

diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg
index 92539b9b76fb8e278a43375a685ccea517b0e2c6..6897ccc16fa9cfdd6e44e504e18b495570ba5054 100644 (file)
--- a/effects-ultimate.cfg
+++ b/effects-ultimate.cfg
@@ -1,6 +1,6 @@
 cl_decals 1
 cl_decals_models 1
-cl_decals_time 10
+cl_decals_fadetime 10
 cl_particles_quality 1
 cl_damageeffect 2
 cl_spawn_point_particles 1

diff --git a/effects-ultra.cfg b/effects-ultra.cfg
index 63cfc63ea9fedb7e82b692ab83477eb36c413484..f80e7c3e4b1df057b3372f7ddd36a1745a178565 100644 (file)
--- a/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@ -1,6 +1,6 @@
 cl_decals 1
 cl_decals_models 0
-cl_decals_time 10
+cl_decals_fadetime 10
 cl_particles_quality 1
 cl_damageeffect 1
 cl_spawn_point_particles 1

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index a963d1e3099862fb485fff19d842f5f5206522b8..e3b562ee3bb0459385968fa0a99e16f38bd63151 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -193,7 +193,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, me.rows - 1, 0);