X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fteamplay.qc;fp=qcsrc%2Fserver%2Fteamplay.qc;h=ba1b4e6eedacb91412044bd0529c472ac3ffb977;hb=e3507f4fdbc2b3e15b663365e57e0aa60f3cf1a6;hp=2f6963bf71b9f0d85c1a86cae7fcafffebadc602;hpb=02013c593abe7ccb7c6502148df33b34390d8216;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 2f6963bf7..ba1b4e6ee 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -1,20 +1,10 @@
-string cache_mutatormsg;
-string cache_lastmutatormsg;
-
-// client counts for each team
-float c1, c2, c3, c4;
-// # of bots on those teams
-float cb1, cb2, cb3, cb4;
-
-//float audit_teams_time;
+#include "teamplay.qh"
 
 void TeamchangeFrags(entity e)
 {
 	PlayerScore_Clear(e);
 }
 
-void entcs_init();
-
 void LogTeamchange(float player_id, float team_number, float type)
 {
 	if(!autocvar_sv_eventlog)
@@ -595,11 +585,11 @@ float TeamSmallerEqThanTeam(float ta, float tb, entity e)
 
 	// invalid
 	if(ca < 0 || cb < 0)
-		return FALSE;
+		return false;
 
 	// equal
 	if(ta == tb)
-		return TRUE;
+		return true;
 
 	if(IS_REAL_CLIENT(e))
 	{
@@ -613,10 +603,10 @@ float TeamSmallerEqThanTeam(float ta, float tb, entity e)
 	// keep teams alive (teams of size 0 always count as smaller, ignoring score)
 	if(ca < 1)
 		if(cb >= 1)
-			return TRUE;
+			return true;
 	if(ca >= 1)
 		if(cb < 1)
-			return FALSE;
+			return false;
 
 	// first, normalize
 	f = max(ca, cb, 1);
@@ -735,7 +725,7 @@ float JoinBestTeam(entity pl, float only_return_best, float forcebestteam)
 		// otherwise end up on the smallest team (handled below)
 	}
 
-	smallest = FindSmallestTeam(pl, TRUE);
+	smallest = FindSmallestTeam(pl, true);
 
 	if(!only_return_best && !pl.bot_forced_team)
 	{
@@ -812,7 +802,7 @@ void SV_ChangeTeam(float _color)
 	if(scolor == dcolor)
 	{
 		//bprint("same team change\n");
-		SetPlayerTeam(self, dteam, steam, TRUE);
+		SetPlayerTeam(self, dteam, steam, true);
 		return;
 	}
 
@@ -840,7 +830,7 @@ void SV_ChangeTeam(float _color)
 		TeamchangeFrags(self);
 	}
 
-	SetPlayerTeam(self, dteam, steam, FALSE);
+	SetPlayerTeam(self, dteam, steam, false);
 
 	if(IS_PLAYER(self) && steam != dteam)
 	{
@@ -984,7 +974,7 @@ void ShufflePlayerOutOfTeam (float source_team)
 
 	// move the player to the new team
 	TeamchangeFrags(selected);
-	SetPlayerTeam(selected, smallestteam, source_team, FALSE);
+	SetPlayerTeam(selected, smallestteam, source_team, false);
 
 	if(selected.deadflag == DEAD_NO)
 		Damage(selected, selected, selected, 100000, DEATH_AUTOTEAMCHANGE, selected.origin, '0 0 0');