add cl_decals_models to effects configs (only in ultra and ultimate) and to the menu

diff --git a/effects-high.cfg b/effects-high.cfg
index 664fca7ad3aa2b8e51e595a3e0e0f17bd5f30824..48d0d43b87e409e030ca2ea3783fe1e7fd57bfd4 100644 (file)
--- a/effects-high.cfg
+++ b/effects-high.cfg
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_models 0
 cl_decals_time 4
 cl_particles_quality 1
 gl_flashblend 0

diff --git a/effects-low.cfg b/effects-low.cfg
index 769ca51217b5a36b2d5691f34ca3bf8fbe5fb6b7..9609a5780234582d3945e02c316c9a77d188174e 100644 (file)
--- a/effects-low.cfg
+++ b/effects-low.cfg
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 0.4
 gl_flashblend 1

diff --git a/effects-med.cfg b/effects-med.cfg
index a6e5e7d0bd76b1f829cfa6761117040958c602bc..94a85e5091a2146c326077707410d87142075e2f 100644 (file)
--- a/effects-med.cfg
+++ b/effects-med.cfg
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 1
 gl_flashblend 0

diff --git a/effects-normal.cfg b/effects-normal.cfg
index dbad238261bf234989f3c1fc7fc6cc383daea6ee..7822102ba9c11e9a0a4088eecdf5550cbf108a14 100644 (file)
--- a/effects-normal.cfg
+++ b/effects-normal.cfg
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 1
 gl_flashblend 0

diff --git a/effects-omg.cfg b/effects-omg.cfg
index 6e6a1dcbbe96abc8b91f13090016ce4c40fec1b0..a68a15787ded9bb5b8a10003b278054e7e29c3c3 100644 (file)
--- a/effects-omg.cfg
+++ b/effects-omg.cfg
@@ -1,4 +1,5 @@
 cl_decals 0
+cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 0.4
 gl_flashblend 1

diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg
index d6e501892b4fb334dc40a354e5b3d00888475e77..20cd2e563870d40b2678874e6802250a2ffbe02a 100644 (file)
--- a/effects-ultimate.cfg
+++ b/effects-ultimate.cfg
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_models 1
 cl_decals_time 10
 cl_particles_quality 1
 gl_flashblend 0

diff --git a/effects-ultra.cfg b/effects-ultra.cfg
index 47949e551b06203da8447f0425a42023c00eb50e..94d47fab2e7cfcf4a600c625ecf6b8b401d99760 100644 (file)
--- a/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_models 1
 cl_decals_time 10
 cl_particles_quality 1
 gl_flashblend 0

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index 2aa2d52397cb7020196df54513e4e890d010dab2..23cb6a3b9b6a2bc4252280c0df4155a198f39143 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -114,7 +114,9 @@ void XonoticEffectsSettingsTab_fill(entity me)
                me.TD(me, 1, 1.9, e = makeXonoticSlider(500, 2000, 100, "r_drawparticles_drawdistance"));
        me.TR(me);
        me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_decals", _("Decals")));
+               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")));
+                       setDependent(e, "cl_decals", 1, 1);
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Distance:")));