From ff34d52615c7268e19fad7edffdf824a812e40f9 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 11 Nov 2014 20:15:43 +1100 Subject: [PATCH] Set decal time to 1 and use fadetime in configs --- defaultXonotic.cfg | 2 +- effects-low.cfg | 2 +- effects-med.cfg | 2 +- effects-normal.cfg | 2 +- effects-omg.cfg | 2 +- effects-ultimate.cfg | 2 +- effects-ultra.cfg | 2 +- qcsrc/menu/xonotic/dialog_settings_effects.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 2c048b39e..1c6953d8a 100644 --- 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 8d6e72a4d..5e7cec3a2 100644 --- 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 1611943c6..fb05527d7 100644 --- 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 064af6550..40075a853 100644 --- 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 9ede9c7d7..7c39fbbef 100644 --- 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 92539b9b7..6897ccc16 100644 --- 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 63cfc63ea..f80e7c3e4 100644 --- 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 a963d1e30..e3b562ee3 100644 --- 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); -- 2.39.2