X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fteamplay.qc;h=d9d71bc0985c38c4cd42624d83cd6552387cea22;hp=912e22c2441e8c9aabea1cef218d45f234b3a2dc;hb=1194c6af3ef2abc72d7aaced018398ca43f860e4;hpb=55f3ced5089f63c504b67e59e3a4bf0ab9f99988

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 912e22c24..d9d71bc09 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -210,9 +210,6 @@ void InitGameplayMode()
 	fraglimit_override = cvar("fraglimit_override");
 	leadlimit_override = cvar("leadlimit_override");
 
-	if(cvar("g_dodging"))
-		MUTATOR_ADD(dodging);
-	
 	if(g_dm)
 	{
 		game = GAME_DEATHMATCH;
@@ -714,6 +711,16 @@ void CheckAllowedTeams (entity for_whom)
 				c1 = -1;
 		}
 	}
+
+	// if player has a forced team, ONLY allow that one
+	if(self.team_forced == COLOR_TEAM1 && c1 >= 0)
+		c2 = c3 = c4 = -1;
+	else if(self.team_forced == COLOR_TEAM2 && c2 >= 0)
+		c1 = c3 = c4 = -1;
+	else if(self.team_forced == COLOR_TEAM3 && c3 >= 0)
+		c1 = c2 = c4 = -1;
+	else if(self.team_forced == COLOR_TEAM4 && c4 >= 0)
+		c1 = c2 = c3 = -1;
 }
 
 float PlayerValue(entity p)