Fix some things in the damage code

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 99e8dca6339c94e433043b7e7b6215459320ff2c..cf65d9d73973193735fea3e79c54978dc54e4dbd 100644 (file)
--- 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 d66a2187d99bfba75f211811f61d6c114f9c1a09..d5ef02034cee6f21751627f27af8ae25eed9b59d 100644 (file)
--- 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 8f5f55f2f01b94a541673832a61eeb35f31d7f17..a006677bbe77e0b88d4d2f7724ae67a54816f766 100644 (file)
--- 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 c49088156631df6221497b8ebfa51170381e9a78..0dca3ab282030c4bc98969ddcbda261b16b2a90b 100644 (file)
--- 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");