From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 2 Apr 2011 23:10:43 +0000 (+0300)
Subject: Skip the effect if the lifetime or tick cvars are disabled.
X-Git-Tag: xonotic-v0.6.0~110^2^2~161
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6928789ec01bfd54b7c9416b67e9b9f49c6d6627;p=xonotic%2Fxonotic-data.pk3dir.git

Skip the effect if the lifetime or tick cvars are disabled.
---

diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index 922143dc3..fc19f92be 100644
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -84,6 +84,8 @@ void Violence_DamageEffect_SetRepeat(entity pl, float damage, float type)
 	// return if gentle mode is enabled or the damage was not caused by a weapon
 	if(sv_gentle || !type)
 		return;
+	if not(autocvar_sv_damageeffect_tick && autocvar_sv_damageeffect_lifetime)
+		return;
 
 	// if a repeater doesn't exist, spawn one, else update the existing one
 	if(pl.damageeffect_repeater == world)