r5804 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-08 15:17:06 -0500 (Sun, 08 Feb 2009)
New Revision: 5804

Modified:
   trunk/data/qcsrc/server/cl_weapons.qc
   trunk/data/qcsrc/server/cl_weaponsystem.qc
Log:
also remove ammo counter after throwing the last weapon


Modified: trunk/data/qcsrc/server/cl_weapons.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weapons.qc	2009-02-08 20:15:13 UTC (rev 5803)
+++ trunk/data/qcsrc/server/cl_weapons.qc	2009-02-08 20:17:06 UTC (rev 5804)
@@ -296,6 +296,7 @@
 		self.weapon = 0;
 		self.weaponentity.state = WS_CLEAR;
 		self.weaponname = "";
+		self.items &~= IT_AMMO;
 		return;
 	}
 

Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc	2009-02-08 20:15:13 UTC (rev 5803)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc	2009-02-08 20:17:06 UTC (rev 5804)
@@ -472,7 +472,6 @@
 	if (self.weaponentity)
 	{
 		self.weaponentity.state = WS_CLEAR;
-		// self.weaponname = ""; // next frame will setmodel it to "" when needed anyway
 		self.weaponentity.effects = 0;
 	}
 };
@@ -489,7 +488,7 @@
 {
 	entity e;
 	e = get_weaponinfo(windex);
-	self.items = self.items - (self.items & IT_AMMO);
+	self.items &~= IT_AMMO;
 	self.items = self.items | e.items;
 
 	// the two weapon entities will notice this has changed and update their models