r2287 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-04-04 02:25:03 -0400 (Wed, 04 Apr 2007)
New Revision: 2287

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/cl_physics.qc
   trunk/data/qcsrc/server/teamplay.qc
Log:
move player selection display to prethink


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2007-04-03 21:46:15 UTC (rev 2286)
+++ trunk/data/qcsrc/server/cl_client.qc	2007-04-04 06:25:03 UTC (rev 2287)
@@ -1292,8 +1292,6 @@
 
 		CheckRules_Player();
 
-		Nixnex_GiveCurrentWeapon();
-
 		if(self.button7)
 			PrintWelcomeMessage(self);
 
@@ -1307,6 +1305,9 @@
 			return;					// the think tics
 		}
 
+		Nixnex_GiveCurrentWeapon();
+		UpdateSelectedPlayer();
+
 		if (self.deadflag != DEAD_NO)
 		{
 			float button_pressed, force_respawn;

Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc	2007-04-03 21:46:15 UTC (rev 2286)
+++ trunk/data/qcsrc/server/cl_physics.qc	2007-04-04 06:25:03 UTC (rev 2287)
@@ -182,8 +182,6 @@
 	if (self.deadflag)
 		return;
 
-	UpdateSelectedPlayer();
-
 	if (!self.fixangle)
 	{
 		self.angles_x = 0;

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2007-04-03 21:46:15 UTC (rev 2286)
+++ trunk/data/qcsrc/server/teamplay.qc	2007-04-04 06:25:03 UTC (rev 2287)
@@ -16,6 +16,8 @@
 float audit_teams_time;
 
 float() IsTeamBalanceForced = {
+	if(intermission_running)
+		return 0; // no rebalancing whatsoever please
 	if(!cvar("teamplay"))
 		return 0;
 	if(cvar("g_campaign"))