From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 16 Jan 2012 20:04:02 +0000 (+0200)
Subject: Check if the master cvar is enabled first thing in the code
X-Git-Tag: xonotic-v0.6.0~110^2^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=25e72244146e22ea8989790463fa8db93a332d09;p=xonotic%2Fxonotic-data.pk3dir.git

Check if the master cvar is enabled first thing in the code
---

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 703344734..f7bdee24d 100644
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -39,7 +39,7 @@ void DamageEffect(vector hitorg, float dmg, float type, float specnum)
 	string specstr, effectnum;
 	entity e;
 
-	if(autocvar_cl_gentle || autocvar_cl_gentle_damage)
+	if(!autocvar_cl_damageeffect || autocvar_cl_gentle || autocvar_cl_gentle_damage)
 		return;
 	if(!self || !self.modelindex || !self.drawmask)
 		return;
@@ -65,7 +65,7 @@ void DamageEffect(vector hitorg, float dmg, float type, float specnum)
 	// return if we reached our damage effect limit or damages are disabled
 	if(nearestbone)
 	{
-		if(autocvar_cl_damageeffect < 1 || self.total_damages >= autocvar_cl_damageeffect_bones)
+		if(self.total_damages >= autocvar_cl_damageeffect_bones)
 			return; // allow multiple damages on skeletal models
 	}
 	else