r4943 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-30 08:07:34 -0400 (Thu, 30 Oct 2008)
New Revision: 4943

Modified:
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/g_damage.qc
Log:
allow team mates to cut off the hook too


Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2008-10-30 11:45:35 UTC (rev 4942)
+++ trunk/data/qcsrc/server/cl_player.qc	2008-10-30 12:07:34 UTC (rev 4943)
@@ -364,11 +364,6 @@
 {
 	local float take, save, waves, sdelay;
 
-	if(self.hook)
-		if(self.hook.aiment)
-			if(self.hook.aiment == attacker)
-				RemoveGrapplingHook(self); // STOP THAT, you parasite!
-
 	damage = damage * bound(1.0, self.cvar_cl_handicap, 100.0);
 	if(sv_gentle > 0) {
 		pointparticles(particleeffectnum("damage_hit"), hitloc, force, bound(0, damage, 200));

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2008-10-30 11:45:35 UTC (rev 4942)
+++ trunk/data/qcsrc/server/g_damage.qc	2008-10-30 12:07:34 UTC (rev 4943)
@@ -508,6 +508,12 @@
         damage_inflictor = inflictor;
         damage_attacker = attacker;
 		attacker_save = attacker;
+	
+	if(targ.classname == "player")
+		if(targ.hook)
+			if(targ.hook.aiment)
+				if(targ.hook.aiment == attacker)
+					RemoveGrapplingHook(targ); // STOP THAT, you parasite!
 
 	if(deathtype == DEATH_KILL || deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE)
 	{