r3213 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-21 14:38:46 -0500 (Mon, 21 Jan 2008)
New Revision: 3213

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/mode_onslaught.qc
Log:
make onslaught_spawnpoint_use into spawnpoint_use for any team game mode


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2008-01-21 19:36:35 UTC (rev 3212)
+++ trunk/data/qcsrc/server/cl_client.qc	2008-01-21 19:38:46 UTC (rev 3213)
@@ -14,6 +14,12 @@
 	relocate_spawnpoint();
 }
 
+void() spawnpoint_use =
+{
+	if(teams_matter)
+		self.team = activator.team;
+};
+
 float spawn_allbad;
 float spawn_allgood;
 entity Spawn_FilterOutBadSpots(entity firstspot, entity playerlist, float mindist, float teamcheck)

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2008-01-21 19:36:35 UTC (rev 3212)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2008-01-21 19:38:46 UTC (rev 3213)
@@ -1,5 +1,5 @@
 void() info_player_deathmatch; // needed for the other spawnpoints
-void() onslaught_spawnpoint_use;	// when in Onslaught mode, spawnpoitns are triggered to change teams.
+void() spawnpoint_use;
 string ColoredTeamName(float t);
 
 float DistributeEvenly_amount;
@@ -186,8 +186,8 @@
 		setsize(self, PL_MIN, PL_MAX);
 		droptofloor();
 	}
-	if (g_onslaught)
-		self.use = onslaught_spawnpoint_use;
+
+	self.use = spawnpoint_use;
 }
 
 #define strstr strstrofs

Modified: trunk/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- trunk/data/qcsrc/server/mode_onslaught.qc	2008-01-21 19:36:35 UTC (rev 3212)
+++ trunk/data/qcsrc/server/mode_onslaught.qc	2008-01-21 19:38:46 UTC (rev 3213)
@@ -570,8 +570,3 @@
 	self.think = onslaught_link_delayed;
 	self.nextthink = time + 0.1;
 };
-
-void() onslaught_spawnpoint_use =
-{
-	self.team = activator.team;
-};