r2614 - trunk/data/qcsrc/server

[savagex at icculus.org]

Author: savagex
Date: 2007-05-19 14:24:23 -0400 (Sat, 19 May 2007)
New Revision: 2614

Modified:
   trunk/data/qcsrc/server/assault.qc
   trunk/data/qcsrc/server/cl_client.qc
Log:
some stuff for spawn point selection.


Modified: trunk/data/qcsrc/server/assault.qc
===================================================================
--- trunk/data/qcsrc/server/assault.qc	2007-05-19 18:21:19 UTC (rev 2613)
+++ trunk/data/qcsrc/server/assault.qc	2007-05-19 18:24:23 UTC (rev 2614)
@@ -1,14 +1,14 @@
 
 // attacker spawn point
 void info_player_attacker() {
+	info_player_deathmatch();
 	self.team = COLOR_TEAM1; // red, gets swapped every round
-	info_player_deathmatch();
 }
 
 // defender spawn point
 void info_player_defender() {
+	info_player_deathmatch();
 	self.team = COLOR_TEAM2; // blue, gets swapped every round
-	info_player_deathmatch();
 }
 
 // reset this objective. Used when spawning an objective

Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2007-05-19 18:21:19 UTC (rev 2613)
+++ trunk/data/qcsrc/server/cl_client.qc	2007-05-19 18:24:23 UTC (rev 2614)
@@ -141,7 +141,7 @@
 
 	teamcheck = 0;
 
-	if(!anypoint && cvar("g_ctf") )
+	if((!anypoint && cvar("g_ctf")) || cvar("g_assault") )
 		teamcheck = self.team;
 
 	// get the list of players