From 8ea3d89ce81755c729dfc3f69d4dc32dcabae31f Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Sat, 2 Apr 2011 19:26:04 +0300 Subject: [PATCH] Make the effect dependent on both sv_gentle and cl_gentle --- qcsrc/client/gibs.qc | 3 +++ qcsrc/server/g_violence.qc | 2 ++ 2 files changed, 5 insertions(+) diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc index ade42c6de..3a548a319 100644 --- 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 ce8ca83d9..d863669bb 100644 --- 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; -- 2.39.2