X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fteamplay.qc;h=ab8eee07534f0d1a7ab079e58d0e5bbd418ac688;hb=cfe1c93ada091a19449b5b4ca7da5d3776415790;hp=1c8f51734c7e894cdc9d24d845f0628bad9ed9b3;hpb=5dc4bd363b8216f79266979e39a3cbb60a9ffe94;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 1c8f51734..ab8eee075 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -12,7 +12,7 @@ float IsTeamBalanceForced()
 {
 	if(intermission_running)
 		return 0; // no rebalancing whatsoever please
-	if(!teams_matter)
+	if(!teamplay)
 		return 0;
 	if(autocvar_g_campaign)
 		return 0;
@@ -149,7 +149,7 @@ void ReadGameCvars()
 		g_tdm = 1;
 	}
 
-	teams_matter = 0;
+	teamplay = 0;
 	serverflags &~= SERVERFLAG_TEAMPLAY;
 }
 
@@ -162,7 +162,7 @@ void default_delayedinit()
 void ActivateTeamplay()
 {
 	serverflags |= SERVERFLAG_TEAMPLAY;
-	teams_matter = 1;
+	teamplay = 1;
 }
 
 void InitGameplayMode()
@@ -382,7 +382,7 @@ void InitGameplayMode()
 		MUTATOR_ADD(gamemode_keepaway);
 	}
 
-	if(teams_matter)
+	if(teamplay)
 		entcs_init();
 
 	// save it (for the next startup)
@@ -517,18 +517,18 @@ void PrintWelcomeMessage(entity pl)
 		modifications = strcat(modifications, ", No start weapons");
 	if(autocvar_sv_gravity < 800)
 		modifications = strcat(modifications, ", Low gravity");
-	if(g_cloaked)
+	if(g_cloaked && !g_cts)
 		modifications = strcat(modifications, ", Cloaked");
 	if(g_grappling_hook)
 		modifications = strcat(modifications, ", Hook");
 	if(g_midair)
 		modifications = strcat(modifications, ", Midair");
 	if(g_pinata)
-		modifications = strcat(modifications, ", Pinata");
-	if(g_weapon_stay)
+		modifications = strcat(modifications, ", Piñata");
+	if(g_weapon_stay && !g_cts)
 		modifications = strcat(modifications, ", Weapons stay");
 	if(g_bloodloss > 0)
-		modifications = strcat(modifications, ", Bloodloss");
+		modifications = strcat(modifications, ", Blood loss");
 	if(g_jetpack)
 		modifications = strcat(modifications, ", Jet pack");
 	modifications = substring(modifications, 2, strlen(modifications) - 2);
@@ -586,7 +586,7 @@ void SetPlayerColors(entity pl, float _color)
 	shirt = _color & 0xF0;
 
 
-	if(teams_matter) {
+	if(teamplay) {
 		setcolor(pl, 16*pants + pants);
 	} else {
 		setcolor(pl, shirt + pants);
@@ -903,7 +903,7 @@ float JoinBestTeam(entity pl, float only_return_best, float forcebestteam)
 	float smallest, selectedteam;
 
 	// don't join a team if we're not playing a team game
-	if(!teams_matter)
+	if(!teamplay)
 		return 0;
 
 	// find out what teams are available
@@ -980,7 +980,7 @@ void SV_ChangeTeam(float _color)
 	float scolor, dcolor, steam, dteam, dbotcount, scount, dcount;
 
 	// in normal deathmatch we can just apply the color and we're done
-	if(!teams_matter) {
+	if(!teamplay) {
 		SetPlayerColors(self, _color);
 		return;
 	}