r4962 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-11-01 08:17:42 -0400 (Sat, 01 Nov 2008)
New Revision: 4962

Modified:
   trunk/data/qcsrc/server/g_damage.qc
Log:
nullify gravity bomb on team mates


Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2008-11-01 12:12:32 UTC (rev 4961)
+++ trunk/data/qcsrc/server/g_damage.qc	2008-11-01 12:17:42 UTC (rev 4962)
@@ -515,6 +515,17 @@
 				if(targ.hook.aiment == attacker)
 					RemoveGrapplingHook(targ); // STOP THAT, you parasite!
 
+	// special rule: gravity bomb does not hit team mates (other than for disconnecting the hook)
+	if(DEATH_WEAPONOF(deathtype) == WEP_HOOK)
+	{
+		if(targ.classname == "player")
+			if not(IsDifferentTeam(targ, attacker))
+			{
+				damage = 0;
+				force = '0 0 0';
+			}
+	}
+
 	if(deathtype == DEATH_KILL || deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE)
 	{
 		// These are ALWAYS lethal