r3307 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-30 04:03:36 -0500 (Wed, 30 Jan 2008)
New Revision: 3307

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/cl_weapons.qc
Log:
minor fix to switching back to previous weapon


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2008-01-29 20:19:17 UTC (rev 3306)
+++ trunk/data/qcsrc/server/cl_client.qc	2008-01-30 09:03:36 UTC (rev 3307)
@@ -540,6 +540,7 @@
 		self.armorvalue = start_armorvalue;
 		self.items = start_items;
 		self.switchweapon = start_switchweapon;
+		self.cnt = start_switchweapon;
 		self.weapon = 0;
 		self.jump_interval = time;
 

Modified: trunk/data/qcsrc/server/cl_weapons.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weapons.qc	2008-01-29 20:19:17 UTC (rev 3306)
+++ trunk/data/qcsrc/server/cl_weapons.qc	2008-01-30 09:03:36 UTC (rev 3307)
@@ -146,7 +146,7 @@
 	if (self.weapon != imp)
 	if (client_hasweapon(self, imp, TRUE, TRUE))
 	{
-		self.cnt = self.weapon;
+		self.cnt = self.weapon ? self.weapon : self.switchweapon;
 		self.switchweapon = imp;
 	}
 };
@@ -175,7 +175,7 @@
 		if (weaponwant > WEP_LAST)
 			weaponwant = WEP_FIRST;
 	}
-	self.cnt = self.weapon;
+	self.cnt = self.weapon ? self.weapon : self.switchweapon;
 	self.switchweapon = weaponwant;
 };
 
@@ -203,7 +203,7 @@
 		if (weaponwant > WEP_LAST)
 			weaponwant = WEP_FIRST;
 	}
-	self.cnt = self.weapon;
+	self.cnt = self.weapon ? self.weapon : self.switchweapon;
 	self.switchweapon = weaponwant;
 };