From c49b1f76db1a141813b81fe3d5e60a4071930a76 Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 15 Jan 2008 11:16:20 +0000 Subject: [PATCH] fix missing electrobitch git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3147 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/g_damage.qc | 9 +++++---- data/qcsrc/server/w_electro.qc | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc index e23219527..ee9cb50d5 100644 --- a/data/qcsrc/server/g_damage.qc +++ b/data/qcsrc/server/g_damage.qc @@ -450,7 +450,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float { if(clienttype(attacker) == CLIENTTYPE_REAL) if(IsDifferentTeam(self, attacker)) - yoda = 1; + yoda = 1; } if (deathtype == IT_LASER) { @@ -468,9 +468,10 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float } } else { if (!targ.deadflag) - if(IsFlying(targ)) - if(IsDifferentTeam(self, targ)) - yoda = 1; + if(targ.takedamage == DAMAGE_AIM) + if(IsFlying(targ)) + if(IsDifferentTeam(self, targ)) + yoda = 1; } // apply strength multiplier diff --git a/data/qcsrc/server/w_electro.qc b/data/qcsrc/server/w_electro.qc index 728b0f9f9..eb7d67650 100644 --- a/data/qcsrc/server/w_electro.qc +++ b/data/qcsrc/server/w_electro.qc @@ -49,7 +49,7 @@ void W_Plasma_Touch (void) if (other.takedamage == DAMAGE_AIM) { o = self.owner; W_Plasma_Explode (); - if(!other.deadflag) + if(other.classname == "player") if(IsDifferentTeam(o, other)) if(IsFlying(other)) announce(o, "announcer/male/electrobitch.ogg"); @@ -70,7 +70,7 @@ void W_Plasma_TouchExplode (void) o = self.owner; W_Plasma_Explode (); if(other.takedamage == DAMAGE_AIM) - if(!other.deadflag) + if(other.classname == "player") if(IsDifferentTeam(o, other)) if(IsFlying(other)) announce(o, "announcer/male/electrobitch.ogg"); -- 2.39.2