r4291 - in trunk/data/qcsrc: client common server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-02 12:24:52 -0400 (Tue, 02 Sep 2008)
New Revision: 4291

Modified:
   trunk/data/qcsrc/client/View.qc
   trunk/data/qcsrc/common/constants.qh
   trunk/data/qcsrc/server/cl_weapons.qc
   trunk/data/qcsrc/server/g_world.qc
   trunk/data/qcsrc/server/w_common.qc
Log:
fix the big bugs in my weapons commit


Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2008-09-02 14:09:14 UTC (rev 4290)
+++ trunk/data/qcsrc/client/View.qc	2008-09-02 16:24:52 UTC (rev 4291)
@@ -121,7 +121,7 @@
 	
 	sbar_alpha_fg = cvar("sbar_alpha_fg" );
 	sbar_hudselector = cvar("sbar_hudselector");
-	activeweapon = getstati(STAT_ACTIVEWEAPON);
+	activeweapon = getstati(STAT_SWITCHWEAPON);
 	teamplay = cvar("teamplay");
 
 	if(last_weapon != activeweapon) {

Modified: trunk/data/qcsrc/common/constants.qh
===================================================================
--- trunk/data/qcsrc/common/constants.qh	2008-09-02 14:09:14 UTC (rev 4290)
+++ trunk/data/qcsrc/common/constants.qh	2008-09-02 16:24:52 UTC (rev 4291)
@@ -206,6 +206,7 @@
 const float STAT_CTF_STATE = 33;
 const float STAT_SYS_TICRATE = 34;
 const float STAT_WEAPONS = 35;
+const float STAT_SWITCHWEAPON = 36;
 const float CTF_STATE_ATTACK = 1;
 const float CTF_STATE_DEFEND = 2;
 const float CTF_STATE_COMMANDER = 3;

Modified: trunk/data/qcsrc/server/cl_weapons.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weapons.qc	2008-09-02 14:09:14 UTC (rev 4290)
+++ trunk/data/qcsrc/server/cl_weapons.qc	2008-09-02 16:24:52 UTC (rev 4291)
@@ -28,7 +28,6 @@
 				return weaponwant;
 			if(!first_valid)
 				first_valid = weaponwant;
-			prev_valid = weaponwant;
 			if(weaponwant == pl.switchweapon)
 			{
 				if(dir >= 0)
@@ -36,11 +35,9 @@
 				else if(prev_valid)
 					return prev_valid;
 				else
-				{
 					switchtolast = 1;
-					break;
-				}
 			}
+			prev_valid = weaponwant;
 		}
 	}
 	if(first_valid)
@@ -73,13 +70,13 @@
 // next weapon
 void W_NextWeapon()
 {
-	W_CycleWeapon(self.cvar_cl_weaponpriority, +1);
+	W_CycleWeapon(self.cvar_cl_weaponpriority, -1);
 }
 
 // prev weapon
 void W_PreviousWeapon()
 {
-	W_CycleWeapon(self.cvar_cl_weaponpriority, -1);
+	W_CycleWeapon(self.cvar_cl_weaponpriority, +1);
 }
 
 string W_FixWeaponOrder(string order, float complete)

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-09-02 14:09:14 UTC (rev 4290)
+++ trunk/data/qcsrc/server/g_world.qc	2008-09-02 16:24:52 UTC (rev 4291)
@@ -354,6 +354,7 @@
 
 	addstat(STAT_SYS_TICRATE, AS_FLOAT, stat_sys_ticrate);
 	addstat(STAT_WEAPONS, AS_INT, weapons);
+	addstat(STAT_SWITCHWEAPON, AS_INT, switchweapon);
 
 	next_pingtime = time + 5;
 	world_initialized = 1;

Modified: trunk/data/qcsrc/server/w_common.qc
===================================================================
--- trunk/data/qcsrc/server/w_common.qc	2008-09-02 14:09:14 UTC (rev 4290)
+++ trunk/data/qcsrc/server/w_common.qc	2008-09-02 16:24:52 UTC (rev 4291)
@@ -6,7 +6,7 @@
 	if (!wep)
 		return;
 
-	e.weapons = e.weapons | wep;
+	e.weapons = e.weapons | W_WeaponBit(wep);
 
 	oldself = self;
 	self = e;