r3147 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-15 06:16:20 -0500 (Tue, 15 Jan 2008)
New Revision: 3147

Modified:
   trunk/data/qcsrc/server/g_damage.qc
   trunk/data/qcsrc/server/w_electro.qc
Log:
fix missing electrobitch


Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2008-01-14 21:30:28 UTC (rev 3146)
+++ trunk/data/qcsrc/server/g_damage.qc	2008-01-15 11:16:20 UTC (rev 3147)
@@ -450,7 +450,7 @@
 			{
 				if(clienttype(attacker) == CLIENTTYPE_REAL)
 					if(IsDifferentTeam(self, attacker))
-							yoda = 1;
+						yoda = 1;
 			}
 			if (deathtype == IT_LASER)
 			{
@@ -468,9 +468,10 @@
 			}
 		} 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

Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc	2008-01-14 21:30:28 UTC (rev 3146)
+++ trunk/data/qcsrc/server/w_electro.qc	2008-01-15 11:16:20 UTC (rev 3147)
@@ -49,7 +49,7 @@
 	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 @@
 	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");