r4848 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-24 02:17:05 -0400 (Fri, 24 Oct 2008)
New Revision: 4848

Modified:
   trunk/data/qcsrc/server/g_hook.qc
Log:
offhand hook fixes


Modified: trunk/data/qcsrc/server/g_hook.qc
===================================================================
--- trunk/data/qcsrc/server/g_hook.qc	2008-10-23 15:55:27 UTC (rev 4847)
+++ trunk/data/qcsrc/server/g_hook.qc	2008-10-24 06:17:05 UTC (rev 4848)
@@ -380,7 +380,7 @@
 
 void GrapplingHookFrame()
 {
-	if(g_grappling_hook && timeoutStatus != 2)
+	if(g_grappling_hook && timeoutStatus != 2 && self.weapon != WEP_HOOK)
 	{
 		// offhand hook controls
 		if(self.BUTTON_HOOK)
@@ -393,11 +393,8 @@
 		}
 		else
 		{
-			if(self.hook)
-			{
-				self.hook_state |= HOOK_REMOVING;
-				self.hook_state (-) HOOK_WAITING_FOR_RELEASE;
-			}
+			self.hook_state |= HOOK_REMOVING;
+			self.hook_state (-) HOOK_WAITING_FOR_RELEASE;
 		}
 
 		self.hook_state (-) HOOK_RELEASING;