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 7033447342187528d258a549bbadcfb9af149176..f7bdee24d5595a92b4437e3a8c24a080916bb2f9 100644 (file)
--- 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