r4973 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-11-03 09:22:31 -0500 (Mon, 03 Nov 2008)
New Revision: 4973

Modified:
   trunk/data/qcsrc/server/cl_weaponsystem.qc
   trunk/data/qcsrc/server/w_laser.qc
Log:
hopefully switch weapon switching reallyt


Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc	2008-11-02 20:13:58 UTC (rev 4972)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc	2008-11-03 14:22:31 UTC (rev 4973)
@@ -9,7 +9,7 @@
 
 void W_SwitchWeapon_Force(entity e, float w)
 {
-	e.cnt = e.weapon ? e.weapon : e.switchweapon;
+	e.cnt = e.switchweapon;
 	e.switchweapon = w;
 }
 

Modified: trunk/data/qcsrc/server/w_laser.qc
===================================================================
--- trunk/data/qcsrc/server/w_laser.qc	2008-11-02 20:13:58 UTC (rev 4972)
+++ trunk/data/qcsrc/server/w_laser.qc	2008-11-03 14:22:31 UTC (rev 4973)
@@ -109,8 +109,7 @@
 			}
 			else
 			{
-				if (self.BUTTON_ATCK2)
-				if (client_hasweapon(self, self.cnt, TRUE, FALSE))
+				if(self.switchweapon == WEP_LASER) // don't do this if already switching
 					W_SwitchWeapon (self.cnt);
 			}
 		}