From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 5 Jan 2012 14:15:25 +0000 (+0200)
Subject: Fix the cvar switch check
X-Git-Tag: xonotic-v0.6.0~110^2^2~48
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=379c2f68db30f92ed9b6f53c73869126ae732ecc;p=xonotic%2Fxonotic-data.pk3dir.git

Fix the cvar switch check
---

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 2ac4a01c1..52fd865bf 100644
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -273,10 +273,16 @@ void DamageEffect(vector hitorg, float dmg, float type, float specnum)
 	for(e = world; (e = find(e, classname, "damageeffect")); )
 		if(e.owner.entnum == self.entnum)
 			i += 1;
-	if(autocvar_cl_damageeffect < 1 || (self.isplayermodel && i >= autocvar_cl_damageeffect_limit))
-		return; // allow multiple damage effects on players
-	if(autocvar_cl_damageeffect < 2 || (!self.isplayermodel && i))
-		return; // allow a single damage effect on objects
+	if(self.isplayermodel)
+	{
+		if(autocvar_cl_damageeffect < 1 || i >= autocvar_cl_damageeffect_limit)
+			return; // allow multiple damage effects on players
+	}
+	else
+	{
+		if(autocvar_cl_damageeffect < 2 || i)
+			return; // allow a single damage effect on objects
+	}
 
 	specstr = species_prefix(specnum);
 	life = bound(autocvar_cl_damageeffect_lifetime_min, dmg * autocvar_cl_damageeffect_lifetime, autocvar_cl_damageeffect_lifetime_max);