Rename the effect from WeaponDamage to DamageEffect in code

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 325cc409d3e7ab772ef05bb5f5618fbdfab76846..5a47b6b08042c25e9a5f16e9fb3abe07468883a8 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -967,7 +967,7 @@ void(float bIsNewEntity) CSQC_Ent_Update =
                case ENT_CLIENT_LGBEAM: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_LGBEAM); break;
                case ENT_CLIENT_GAUNTLET: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_GAUNTLET); break;
                case ENT_CLIENT_ACCURACY: Ent_ReadAccuracy(); break;
-               case ENT_CLIENT_WEAPONDAMAGE: Ent_WeaponDamage(); break;
+               case ENT_CLIENT_DAMAGEEFFECT: Ent_DamageEffect(); break;
                default:
                        error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype));
                        break;

diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc
index a3535f026a1c76c6b9420c2f58cf4ad76c1b7abc..34fcd8abb675ed5d788357518fa23e7a8d530bcb 100644 (file)
--- a/qcsrc/client/gibs.qc
+++ b/qcsrc/client/gibs.qc
@@ -275,7 +275,7 @@ void GibSplash_Precache()
     precache_sound ("misc/gib_splat04.wav");
 }
 
-void Ent_WeaponDamage()
+void Ent_DamageEffect()
 {
        float type, specnum1, specnum2;
        vector org;

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 141ff000be26eea4fdcdcaa38c76193522ea6471..65a64aa3a86d219d800070aa90a33c942fcd389d 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -113,7 +113,7 @@ const float ENT_CLIENT_HOOK = 27;
 const float ENT_CLIENT_LGBEAM = 28;
 const float ENT_CLIENT_GAUNTLET = 29;
 const float ENT_CLIENT_ACCURACY = 30;
-const float ENT_CLIENT_WEAPONDAMAGE = 31;
+const float ENT_CLIENT_DAMAGEEFFECT = 31;
 
 const float ENT_CLIENT_TURRET = 40;
 

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 801c6dc02e449bb5decdf5933d815d5e473d3cea..ae9d985dc7c2e13390ae686167a864836f6bb854 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -499,7 +499,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 {
        // if the target is a player or dead body, activate damage effects
        if(targ.classname == "player" || targ.classname == "body")
-               Violence_WeaponDamage_SetRepeat(targ, DEATH_WEAPONOF(deathtype));
+               Violence_DamageEffect_SetRepeat(targ, DEATH_WEAPONOF(deathtype));
 
        float mirrordamage;
        float mirrorforce;

diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index fc580765de94194a5f12d328118d715daa749dbf..ce8ca83d96455f015a078746d33d3beaa4bd0dd7 100644 (file)
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -38,9 +38,9 @@ void Violence_GibSplash(entity source, float type, float amount, entity attacker
        Violence_GibSplash_At(source.origin + source.view_ofs, source.velocity, type, amount, source, attacker);
 }
 
-float Violence_WeaponDamage_SendEntity(entity to, float sf)
+float Violence_DamageEffect_SendEntity(entity to, float sf)
 {
-       WriteByte(MSG_ENTITY, ENT_CLIENT_WEAPONDAMAGE);
+       WriteByte(MSG_ENTITY, ENT_CLIENT_DAMAGEEFFECT);
        WriteByte(MSG_ENTITY, self.cnt); // the damage weapon
        WriteByte(MSG_ENTITY, self.state); // species
        WriteCoord(MSG_ENTITY, floor(self.origin_x));
@@ -49,7 +49,7 @@ float Violence_WeaponDamage_SendEntity(entity to, float sf)
        return TRUE;
 }
 
-void Violence_WeaponDamage(entity pl, float type)
+void Violence_DamageEffect(entity pl, float type)
 {
        entity e;
 
@@ -59,30 +59,30 @@ void Violence_WeaponDamage(entity pl, float type)
        e.state |= 8 * pl.species; // gib type, ranges from 0 to 15
        setorigin(e, pl.origin);
 
-       Net_LinkEntity(e, FALSE, 0.2, Violence_WeaponDamage_SendEntity);
+       Net_LinkEntity(e, FALSE, 0.2, Violence_DamageEffect_SendEntity);
 }
 
 .float lifetime;
-.float player_weapondamage_active;
+.float player_damageeffect_active;
 
-void Violence_WeaponDamage_DoRepeat()
+void Violence_DamageEffect_DoRepeat()
 {
        if(time > self.lifetime)
        {
-               self.owner.player_weapondamage_active = FALSE;
+               self.owner.player_damageeffect_active = FALSE;
                self.nextthink = 0;
                remove(self);
                return;
        }
 
-       Violence_WeaponDamage(self.owner, self.cnt);
+       Violence_DamageEffect(self.owner, self.cnt);
        self.nextthink = time + autocvar_sv_damageeffect_tick;
 }
 
-void Violence_WeaponDamage_SetRepeat(entity pl, float type)
+void Violence_DamageEffect_SetRepeat(entity pl, float type)
 {
        // return if we already have a damage effect active, else too many damage effects get spammed
-       if(pl.player_weapondamage_active)
+       if(pl.player_damageeffect_active)
                return;
 
        entity repeater;
@@ -92,8 +92,8 @@ void Violence_WeaponDamage_SetRepeat(entity pl, float type)
        repeater.origin = pl.origin;
        repeater.cnt = type;
        repeater.lifetime = time + autocvar_sv_damageeffect_lifetime;
-       repeater.think = Violence_WeaponDamage_DoRepeat;
+       repeater.think = Violence_DamageEffect_DoRepeat;
        repeater.nextthink = time;
 
-       pl.player_weapondamage_active = TRUE;
+       pl.player_damageeffect_active = TRUE;
 }