r5748 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-04 09:47:15 -0500 (Wed, 04 Feb 2009)
New Revision: 5748

Modified:
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
if possible, redirect off-hand hook to on-hand hook


Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-02-04 14:43:22 UTC (rev 5747)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-02-04 14:47:15 UTC (rev 5748)
@@ -871,9 +871,11 @@
 				if(g_lms)
 					t = (e.spawnflags & WEPSPAWNFLAG_NORMAL);
 				else if(g_race)
-					t = (i & WEP_LASER);
+					t = (i == WEP_LASER);
 				else
-					t = (i & (WEP_LASER | WEP_SHOTGUN));
+					t = (i == WEP_LASER || i == WEP_SHOTGUN);
+				if(g_grappling_hook) // if possible, redirect off-hand hook to on-hand hook
+					t += (i == WEP_HOOK);
 			}
 
 			if(t)
@@ -922,10 +924,10 @@
 		}
 	}
 
-	if(g_grappling_hook) // offhand hook
+	if(start_weapons & WEPBIT_HOOK)
 	{
-		start_weapons &~= WEPBIT_HOOK;
-		warmup_start_weapons &~= WEPBIT_HOOK;
+		// can't have off-hand hook, if hook weapon is enabled
+		g_grappling_hook = 0;
 	}
 
 	if(g_weapon_stay == 2)