From 395b77e37afd4209b88019d1599534619dc5a621 Mon Sep 17 00:00:00 2001
From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 14 Dec 2014 12:06:55 +1100
Subject: [PATCH] Apply nyov/effects
---
effects-high.cfg | 2 +-
effects-low.cfg | 2 +-
effects-omg.cfg | 2 +-
effects-ultra.cfg | 6 +++---
qcsrc/menu/xonotic/dialog_settings_effects.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/effects-high.cfg b/effects-high.cfg
index 48c8253a3a..a514ce5cb6 100644
--- 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 91459c7b04..b7e9a98a3a 100644
--- 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 9e30a5fbd3..9018ee2c94 100644
--- 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 6095e189f5..5909f3b83d 100644
--- 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 11cad9fa88..bffb1d339b 100644
--- 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);
--
2.39.5