From: Mario <mario@smbclan.net>
Date: Sun, 10 Jul 2016 15:27:46 +0000 (+1000)
Subject: Fix TDM crash (again)
X-Git-Tag: xonotic-v0.8.2~700^2~10^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eb5cffe10578b06ab8270fcd3045e73c219ffd38;p=xonotic%2Fxonotic-data.pk3dir.git

Fix TDM crash (again)
---

diff --git a/qcsrc/server/mutators/mutator/gamemode_tdm.qc b/qcsrc/server/mutators/mutator/gamemode_tdm.qc
index d0bde8c4f..0c7c87c03 100644
--- a/qcsrc/server/mutators/mutator/gamemode_tdm.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_tdm.qc
@@ -58,12 +58,12 @@ spawnfunc(tdm_team)
 }
 
 // code from here on is just to support maps that don't have team entities
-void tdm_SpawnTeam (string teamname, float teamcolor)
+void tdm_SpawnTeam (string teamname, int teamcolor)
 {
 	entity this = new_pure(tdm_team);
 	this.netname = teamname;
-	this.cnt = teamcolor;
-	this.team = this.cnt + 1;
+	this.cnt = teamcolor - 1;
+	this.team = teamcolor;
 	this.spawnfunc_checked = true;
 	//spawnfunc_tdm_team(this);
 }
@@ -75,7 +75,7 @@ void tdm_DelayedInit(entity this)
 	{
 		LOG_TRACE("No \"tdm_team\" entities found on this map, creating them anyway.\n");
 
-		int numteams = min(4, autocvar_g_tdm_teams_override);
+		int numteams = autocvar_g_tdm_teams_override;
 
 		if(numteams < 2) { numteams = autocvar_g_tdm_teams; }
 		numteams = bound(2, numteams, 4);
@@ -86,11 +86,14 @@ void tdm_DelayedInit(entity this)
 		if(numteams >= 3) teams |= BIT(2);
 		if(numteams >= 4) teams |= BIT(3);
 
-		//numteams = teams; // now set it?
-
-		float i;
-		for(i = 1; i <= numteams && (teams & BIT(numteams)); ++i)
-			tdm_SpawnTeam(Team_ColorName(Team_NumberToTeam(i)), Team_NumberToTeam(i) - 1);
+		if(teams & BIT(0))
+			tdm_SpawnTeam("Red", NUM_TEAM_1);
+		if(teams & BIT(1))
+			tdm_SpawnTeam("Blue", NUM_TEAM_2);
+		if(teams & BIT(2))
+			tdm_SpawnTeam("Yellow", NUM_TEAM_3);
+		if(teams & BIT(3))
+			tdm_SpawnTeam("Pink", NUM_TEAM_4);
 	}
 }