X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_tdm.qc;h=aad31932884556dff7b4a7b6f1a186dcbf15e44c;hb=1d2572e36c11512af047c460cf58edd19954a0aa;hp=787412908513449a6f5c28a81d4a47557ca95023;hpb=fc15d72b041c9a748b605ba28735380fbe5b5b01;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator/gamemode_tdm.qc b/qcsrc/server/mutators/mutator/gamemode_tdm.qc
index 787412908..aad319328 100644
--- a/qcsrc/server/mutators/mutator/gamemode_tdm.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_tdm.qc
@@ -1,45 +1,5 @@
 #include "gamemode_tdm.qh"
-#ifndef GAMEMODE_TDM_H
-#define GAMEMODE_TDM_H
 
-int autocvar_g_tdm_point_limit;
-int autocvar_g_tdm_point_leadlimit;
-bool autocvar_g_tdm_team_spawns;
-void tdm_DelayedInit(entity this);
-
-REGISTER_MUTATOR(tdm, false)
-{
-	MUTATOR_ONADD
-	{
-		if (time > 1) // game loads at time 1
-			error("This is a game type and it cannot be added at runtime.");
-		InitializeEntity(NULL, tdm_DelayedInit, INITPRIO_GAMETYPE);
-
-		ActivateTeamplay();
-		SetLimits(autocvar_g_tdm_point_limit, autocvar_g_tdm_point_leadlimit, autocvar_timelimit_override, -1);
-		if (autocvar_g_tdm_team_spawns)
-			have_team_spawns = -1; // request team spawns
-	}
-
-	MUTATOR_ONROLLBACK_OR_REMOVE
-	{
-		// we actually cannot roll back tdm_Initialize here
-		// BUT: we don't need to! If this gets called, adding always
-		// succeeds.
-	}
-
-	MUTATOR_ONREMOVE
-	{
-		LOG_INFO("This is a game type and it cannot be removed at runtime.");
-		return -1;
-	}
-
-	return 0;
-}
-
-#endif
-
-#ifdef IMPLEMENTATION
 int autocvar_g_tdm_teams;
 int autocvar_g_tdm_teams_override;
 
@@ -51,20 +11,21 @@ Keys:
 "cnt" Scoreboard color of the team (for example 4 is red and 13 is blue)... */
 spawnfunc(tdm_team)
 {
-	if(!g_tdm || !this.cnt) { remove(this); return; }
+	if(!g_tdm || !this.cnt) { delete(this); return; }
 
 	this.classname = "tdm_team";
 	this.team = this.cnt + 1;
 }
 
 // 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(tdm_team);
+	entity this = new_pure(tdm_team);
 	this.netname = teamname;
-	this.cnt = teamcolor;
+	this.cnt = teamcolor - 1;
+	this.team = teamcolor;
 	this.spawnfunc_checked = true;
-	spawnfunc_tdm_team(this);
+	//spawnfunc_tdm_team(this);
 }
 
 void tdm_DelayedInit(entity this)
@@ -72,20 +33,24 @@ void tdm_DelayedInit(entity this)
 	// if no teams are found, spawn defaults
 	if(find(NULL, classname, "tdm_team") == NULL)
 	{
-		LOG_TRACE("No \"tdm_team\" entities found on this map, creating them anyway.\n");
-
-		int numteams = min(4, autocvar_g_tdm_teams_override);
+		LOG_TRACE("No \"tdm_team\" entities found on this map, creating them anyway.");
 
+		int numteams = autocvar_g_tdm_teams_override;
 		if(numteams < 2) { numteams = autocvar_g_tdm_teams; }
-		numteams = bound(2, numteams, 4);
 
-		float i;
-		for(i = 1; i <= numteams; ++i)
-			tdm_SpawnTeam(Team_ColorName(Team_NumberToTeam(i)), Team_NumberToTeam(i) - 1);
+		int teams = BITS(bound(2, numteams, 4));
+		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);
 	}
 }
 
-MUTATOR_HOOKFUNCTION(tdm, GetTeamCount, CBC_ORDER_EXCLUSIVE)
+MUTATOR_HOOKFUNCTION(tdm, CheckAllowedTeams, CBC_ORDER_EXCLUSIVE)
 {
 	M_ARGV(1, string) = "tdm_team";
 	return true;
@@ -96,5 +61,3 @@ MUTATOR_HOOKFUNCTION(tdm, Scores_CountFragsRemaining)
 	// announce remaining frags
 	return true;
 }
-
-#endif