X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fteamplay.qc;h=b8f2f3ac8746ea4e02daae0936833d2086954699;hb=f879dea04474678d9a263cf5d8c127415e390ca5;hp=f37167a498e268b98e4819ffaf099b10c7c5462d;hpb=6a00227e026fb56b51431232107244ddb3ce2d55;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index f37167a49..b8f2f3ac8 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -6,7 +6,7 @@ float c1, c2, c3, c4;
 // # of bots on those teams
 float cb1, cb2, cb3, cb4;
 
-float audit_teams_time;
+//float audit_teams_time;
 
 void TeamchangeFrags(entity e)
 {
@@ -53,7 +53,6 @@ string TeamNoName(float t)
 }
 
 void dom_init();
-void ctf_init();
 void runematch_init();
 void tdm_init();
 void entcs_init();
@@ -142,10 +141,9 @@ void InitGameplayMode()
 	if(g_ctf)
 	{
 		ActivateTeamplay();
-		g_ctf_ignore_frags = autocvar_g_ctf_ignore_frags;
 		fraglimit_override = autocvar_capturelimit_override;
 		leadlimit_override = autocvar_captureleadlimit_override;
-		ctf_init();
+		MUTATOR_ADD(gamemode_ctf);
 		have_team_spawns = -1; // request team spawns
 	}
 
@@ -213,6 +211,7 @@ void InitGameplayMode()
 	{
 		ActivateTeamplay();
 		have_team_spawns = -1; // request team spawns
+		MUTATOR_ADD(gamemode_onslaught);
 	}
 
 	if(g_race)
@@ -835,7 +834,7 @@ float JoinBestTeam(entity pl, float only_return_best, float forcebestteam)
 //void() ctf_playerchanged;
 void SV_ChangeTeam(float _color)
 {
-	float scolor, dcolor, steam, dteam, dbotcount, scount, dcount;
+	float scolor, dcolor, steam, dteam; //, dbotcount, scount, dcount;
 
 	// in normal deathmatch we can just apply the color and we're done
 	if(!teamplay) {
@@ -883,7 +882,8 @@ void SV_ChangeTeam(float _color)
 		return; // changing teams is not allowed
 	}
 
-	if(autocvar_g_balance_teams_prevent_imbalance)
+	// autocvar_g_balance_teams_prevent_imbalance only makes sense if autocvar_g_balance_teams is on, as it makes the team selection dialog pointless
+	if(autocvar_g_balance_teams && autocvar_g_balance_teams_prevent_imbalance)
 	{
 		GetTeamCounts(self);
 		if(!TeamSmallerEqThanTeam(dteam, steam, self))
@@ -909,7 +909,6 @@ void SV_ChangeTeam(float _color)
 		if(self.deadflag == DEAD_NO)
 			Damage(self, self, self, 100000, DEATH_TEAMCHANGE, self.origin, '0 0 0');
 	}
-	//ctf_playerchanged();
 }
 
 void ShufflePlayerOutOfTeam (float source_team)