Make the effect dependent on both sv_gentle and cl_gentle

diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc
index ade42c6deb9b052504abb65724f629268195e4ad..3a548a31941469093de023e1f58e054525f220f2 100644 (file)
--- a/qcsrc/client/gibs.qc
+++ b/qcsrc/client/gibs.qc
@@ -288,6 +288,9 @@ void Ent_DamageEffect()
        org_y = ReadCoord();
        org_z = ReadCoord();
 
+       if(autocvar_cl_gentle || autocvar_cl_gentle_damage)
+               return;
+
        e = get_weaponinfo(type);
 
        specnum2 = (specnum1 & 0x78) / 8; // blood type: using four bits (0..7, bit indexes 3,4,5)

diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index ce8ca83d96455f015a078746d33d3beaa4bd0dd7..d863669bb0b79f11a045a33c7363516a807a6de5 100644 (file)
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -81,6 +81,8 @@ void Violence_DamageEffect_DoRepeat()
 
 void Violence_DamageEffect_SetRepeat(entity pl, float type)
 {
+       if(sv_gentle)
+               return;
        // return if we already have a damage effect active, else too many damage effects get spammed
        if(pl.player_damageeffect_active)
                return;