r4270 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-31 09:17:05 -0400 (Sun, 31 Aug 2008)
New Revision: 4270

Modified:
   trunk/data/qcsrc/server/cl_weaponsystem.qc
   trunk/data/qcsrc/server/defs.qh
Log:
unbreak NixNex


Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc	2008-08-31 00:56:32 UTC (rev 4269)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc	2008-08-31 13:17:05 UTC (rev 4270)
@@ -443,6 +443,10 @@
 	if (timeoutStatus == 2) //don't allow the player to shoot while game is paused
 		return FALSE;
 
+	// do not even think about shooting if switching
+	if(self.switchweapon != self.weapon)
+		return FALSE;
+
 	// don't fire if previous attack is not finished
 	if (ATTACK_FINISHED(self) > time + frametime * 0.5)
 		return FALSE;

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2008-08-31 00:56:32 UTC (rev 4269)
+++ trunk/data/qcsrc/server/defs.qh	2008-08-31 13:17:05 UTC (rev 4270)
@@ -212,11 +212,10 @@
 float WEP_NEX				= 7; // float	IT_NEX					= 32;
 float WEP_HAGAR				= 8; // float	IT_HAGAR				= 64;
 float WEP_ROCKET_LAUNCHER	= 9; // float	IT_ROCKET_LAUNCHER		= 128;
-float WEP_ANTINEX			= 10;
 // For weapon cycling commands
 float WEP_FIRST				= 1;
-float WEP_LAST				= 10;
-float WEP_COUNT             = 11;
+float WEP_LAST				= 9;
+float WEP_COUNT             = 10;
 
 void(entity client, string s) centerprint_builtin = #73;
 .vector dest1, dest2;