r4133 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-13 11:57:59 -0400 (Wed, 13 Aug 2008)
New Revision: 4133

Modified:
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/g_hook.qc
Log:
when hooked to a player, detach once he hurts you


Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2008-08-13 15:52:35 UTC (rev 4132)
+++ trunk/data/qcsrc/server/cl_player.qc	2008-08-13 15:57:59 UTC (rev 4133)
@@ -355,6 +355,10 @@
 {
 	local float take, save, waves, sdelay;
 
+	if(self.hook)
+		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_hook.qc
===================================================================
--- trunk/data/qcsrc/server/g_hook.qc	2008-08-13 15:52:35 UTC (rev 4132)
+++ trunk/data/qcsrc/server/g_hook.qc	2008-08-13 15:57:59 UTC (rev 4133)
@@ -94,7 +94,7 @@
 	}
 	if(LostMovetypeFollow(self))
 	{
-		remove(self);
+		RemoveGrapplingHook(self.owner);
 		return;
 	}