r3261 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-24 17:01:32 -0500 (Thu, 24 Jan 2008)
New Revision: 3261

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/g_world.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
support maps without team specific spawn points in CTF/Assault/Onslaught again


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2008-01-24 21:23:05 UTC (rev 3260)
+++ trunk/data/qcsrc/server/cl_client.qc	2008-01-24 22:01:32 UTC (rev 3261)
@@ -14,7 +14,6 @@
 	relocate_spawnpoint();
 }
 
-float some_spawn_has_been_used;
 void() spawnpoint_use =
 {
 	if(teams_matter)
@@ -81,9 +80,7 @@
 		}
 		spot = nextspot;
 	}
-	// if we couldn't find ANY good points, return the original list
-	if (!newfirstspot)
-		newfirstspot = firstspot;
+	// if we couldn't find ANY good points, return world
 	return newfirstspot;
 }
 
@@ -156,7 +153,7 @@
 
 	teamcheck = 0;
 
-	if(!anypoint && (g_ctf || g_assault || g_onslaught))
+	if(!anypoint && have_team_spawns)
 		teamcheck = self.team;
 
 	// get the list of players

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2008-01-24 21:23:05 UTC (rev 3260)
+++ trunk/data/qcsrc/server/defs.qh	2008-01-24 22:01:32 UTC (rev 3261)
@@ -387,3 +387,6 @@
 float ServerProgsDB;
 
 .float team_saved;
+
+float some_spawn_has_been_used;
+float have_team_spawns;

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-01-24 21:23:05 UTC (rev 3260)
+++ trunk/data/qcsrc/server/g_world.qc	2008-01-24 22:01:32 UTC (rev 3261)
@@ -1536,7 +1536,7 @@
 {
 	entity head;
 
-	if(!g_ctf && !g_assault && !g_onslaught)
+	if(!have_team_spawns)
 		return WINNING_NO;
 
 	team1_score = team2_score = team3_score = team4_score = 0;
@@ -1581,17 +1581,17 @@
 		if(team2_score)
 		{
 			AddWinners(team, COLOR_TEAM2);
-			ClearFragsForEveryoneBut(team, COLOR_TEAM1);
+			ClearFragsForEveryoneBut(team, COLOR_TEAM2);
 		}
 		if(team3_score)
 		{
 			AddWinners(team, COLOR_TEAM3);
-			ClearFragsForEveryoneBut(team, COLOR_TEAM1);
+			ClearFragsForEveryoneBut(team, COLOR_TEAM3);
 		}
 		if(team4_score)
 		{
 			AddWinners(team, COLOR_TEAM4);
-			ClearFragsForEveryoneBut(team, COLOR_TEAM1);
+			ClearFragsForEveryoneBut(team, COLOR_TEAM4);
 		}
 		return WINNING_YES;
 	}

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2008-01-24 21:23:05 UTC (rev 3260)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2008-01-24 22:01:32 UTC (rev 3261)
@@ -189,6 +189,10 @@
 
 	self.use = spawnpoint_use;
 	self.team_saved = self.team;
+
+	if(g_ctf || g_assault || g_onslaught)
+	if(self.team)
+		have_team_spawns = 1;
 }
 
 #define strstr strstrofs