From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 9 Jan 2012 23:18:40 +0000 (+0200)
Subject: Second requirement for merge; Add the effect to the menu and presets. I don't agree... 
X-Git-Tag: xonotic-v0.6.0~110^2^2~30
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=5e2a3ccc8bb763fe457f10746e86ff60b2d61e4e;p=xonotic%2Fxonotic-data.pk3dir.git

Second requirement for merge; Add the effect to the menu and presets. I don't agree with this, but fine
---

diff --git a/effects-high.cfg b/effects-high.cfg
index 0e011fe56..95fd0f8bd 100644
--- a/effects-high.cfg
+++ b/effects-high.cfg
@@ -2,6 +2,7 @@ cl_decals 1
 cl_decals_models 0
 cl_decals_time 4
 cl_particles_quality 1
+cl_damageeffect 1
 gl_flashblend 0
 gl_picmip -1
 gl_texture_anisotropy 16
diff --git a/effects-low.cfg b/effects-low.cfg
index a9cff5abe..e4391c703 100644
--- a/effects-low.cfg
+++ b/effects-low.cfg
@@ -2,6 +2,7 @@ cl_decals 1
 cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 0.4
+cl_damageeffect 0
 gl_flashblend 1
 gl_picmip 1
 gl_texture_anisotropy 1
diff --git a/effects-med.cfg b/effects-med.cfg
index 5be8356e2..de41d388c 100644
--- a/effects-med.cfg
+++ b/effects-med.cfg
@@ -2,6 +2,7 @@ cl_decals 1
 cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 1
+cl_damageeffect 0
 gl_flashblend 0
 gl_picmip 0
 gl_texture_anisotropy 1
diff --git a/effects-normal.cfg b/effects-normal.cfg
index 0aebfb79d..490087efd 100644
--- a/effects-normal.cfg
+++ b/effects-normal.cfg
@@ -2,6 +2,7 @@ cl_decals 1
 cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 1
+cl_damageeffect 1
 gl_flashblend 0
 gl_picmip 0
 gl_texture_anisotropy 1
diff --git a/effects-omg.cfg b/effects-omg.cfg
index 350e9b849..55a91e450 100644
--- a/effects-omg.cfg
+++ b/effects-omg.cfg
@@ -2,6 +2,7 @@ cl_decals 0
 cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 0.4
+cl_damageeffect 0
 gl_flashblend 1
 gl_picmip 1337
 gl_texture_anisotropy 1
diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg
index 7e4125bf4..8c859f08d 100644
--- a/effects-ultimate.cfg
+++ b/effects-ultimate.cfg
@@ -2,6 +2,7 @@ cl_decals 1
 cl_decals_models 1
 cl_decals_time 10
 cl_particles_quality 1
+cl_damageeffect 2
 gl_flashblend 0
 gl_picmip -1
 gl_texture_anisotropy 16
diff --git a/effects-ultra.cfg b/effects-ultra.cfg
index 1c9b9db30..9dda230ca 100644
--- a/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@ -2,6 +2,7 @@ cl_decals 1
 cl_decals_models 1
 cl_decals_time 10
 cl_particles_quality 1
+cl_damageeffect 1
 gl_flashblend 0
 gl_picmip -1
 gl_texture_anisotropy 16
diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index 385252bcb..8c779bb6e 100644
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -109,6 +109,11 @@ void XonoticEffectsSettingsTab_fill(entity me)
 			e.addValue(e, _("16x"), "16");
 			e.configureXonoticTextSliderValues(e);
 	me.TR(me);
+	me.TR(me);
+		me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Damage effects:")));
+		me.TD(me, 1, 0.75, e = makeXonoticRadioButton(1, "cl_damageeffect", "0", (_("Disabled"))));
+		me.TD(me, 1, 0.75, e = makeXonoticRadioButton(1, "cl_damageeffect", "1", _("Skeletal meshes")));
+		me.TD(me, 1, 0.75, e = makeXonoticRadioButton(1, "cl_damageeffect", "2", _("All meshes")));
 	me.TR(me);
 		me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Particle quality:")));
 		me.TD(me, 1, 1.9, e = makeXonoticSlider(0.2, 1.0, 0.1, "cl_particles_quality"));