From 86e304ee7a73a0f2626d691019760ac7c02293cd Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Thu, 25 Aug 2011 19:23:47 +0300 Subject: [PATCH] Fix some things in the damage code --- qcsrc/client/damage.qc | 4 ++-- qcsrc/server/defs.qh | 2 -- qcsrc/server/g_violence.qc | 3 --- qcsrc/server/miscfunctions.qc | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc index 99e8dca63..cf65d9d73 100644 --- a/qcsrc/client/damage.qc +++ b/qcsrc/client/damage.qc @@ -313,7 +313,7 @@ void Ent_DamageEffect() // if the player already has a damage effect, replace it with the new one entity head; - for(head = world; (head = find(head, classname, "dmgent")); ) + for(head = world; (head = find(head, classname, "damageeffect")); ) { if(head.team == entnumber - 1) { @@ -324,7 +324,7 @@ void Ent_DamageEffect() entity e; e = spawn(); - e.classname = "dmgent"; + e.classname = "damageeffect"; e.team = entnumber - 1; e.dmgpartnum = particleeffectnum(effectnum); e.think = Ent_DamageEffect_Think; diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index d66a2187d..d5ef02034 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -492,8 +492,6 @@ float GetPlayerSoundSampleField_notFound; .float cvar_cl_voice_directional; .float cvar_cl_voice_directional_taunt_attenuation; -.float cvar_cl_damageeffect; - .float version_mismatch; float independent_players; diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc index 8f5f55f2f..a006677bb 100644 --- a/qcsrc/server/g_violence.qc +++ b/qcsrc/server/g_violence.qc @@ -50,9 +50,6 @@ void Violence_GibSplash(entity source, float type, float amount, entity attacker float Violence_DamageEffect_SendEntity(entity to, float sf) { - if not(to.cvar_cl_damageeffect) - return FALSE; // if the client doesn't have the effect enabled, don't send to him and waste bandwidth - WriteByte(MSG_ENTITY, ENT_CLIENT_DAMAGEEFFECT); WriteByte(MSG_ENTITY, self.cnt); // damage amount WriteByte(MSG_ENTITY, self.weapon); // damage weapon diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index c49088156..0dca3ab28 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -600,7 +600,6 @@ void GetCvars(float f) GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[9], "cl_weaponpriority9", W_FixWeaponOrder_AllowIncomplete); GetCvars_handleFloat(s, f, cvar_cl_weaponimpulsemode, "cl_weaponimpulsemode"); GetCvars_handleFloat(s, f, cvar_cl_autotaunt, "cl_autotaunt"); - GetCvars_handleFloat(s, f, cvar_cl_damageeffect, "cl_damageeffect"); GetCvars_handleFloat(s, f, cvar_cl_noantilag, "cl_noantilag"); GetCvars_handleFloat(s, f, cvar_cl_voice_directional, "cl_voice_directional"); GetCvars_handleFloat(s, f, cvar_cl_voice_directional_taunt_attenuation, "cl_voice_directional_taunt_attenuation"); -- 2.39.2