X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_freezetag.qc;h=d6285cdafd112509b99e8c9ffcacd6b0430e3abe;hb=244e5081c5c503c307e557c98ac864f6c9731475;hp=5ab96277b9e4a286a04999ab8c0832fb09d0fdc2;hpb=f88b7ab24a1e8263b1878ddb9be8fa441b39fe68;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index 5ab96277b..d6285cdaf 100644
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -1,13 +1,13 @@
 .float freezetag_frozen_time;
 .float freezetag_frozen_timeout;
-#define ICE_MAX_ALPHA 1
-#define ICE_MIN_ALPHA 0.1
+const float ICE_MAX_ALPHA = 1;
+const float ICE_MIN_ALPHA = 0.1;
 float freezetag_teams;
 
-#define SP_FREEZETAG_REVIVALS 4
+const float SP_FREEZETAG_REVIVALS = 4;
 void freezetag_ScoreRules(float teams)
 {
-	ScoreRules_basics(teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, TRUE); // SFL_SORT_PRIO_PRIMARY
+	ScoreRules_basics(teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, true); // SFL_SORT_PRIO_PRIMARY
 	ScoreInfo_SetLabel_PlayerScore(SP_FREEZETAG_REVIVALS, "revivals", 0);
 	ScoreRules_basics_end();
 }
@@ -39,9 +39,9 @@ void freezetag_count_alive_players()
 #define FREEZETAG_ALIVE_TEAMS() ((redalive > 0) + (bluealive > 0) + (yellowalive > 0) + (pinkalive > 0))
 #define FREEZETAG_ALIVE_TEAMS_OK() (FREEZETAG_ALIVE_TEAMS() == freezetag_teams)
 
-float prev_missing_teams_mask;
 float freezetag_CheckTeams()
 {
+	static float prev_missing_teams_mask;
 	if(FREEZETAG_ALIVE_TEAMS_OK())
 	{
 		if(prev_missing_teams_mask > 0)
@@ -188,7 +188,7 @@ void freezetag_Freeze(entity attacker)
 	if(autocvar_g_freezetag_frozen_maxtime > 0)
 		self.freezetag_frozen_timeout = time + autocvar_g_freezetag_frozen_maxtime;
 
-	Freeze(self, 0, 1, TRUE);
+	Freeze(self, 0, 1, true);
 
 	freezetag_count_alive_players();
 
@@ -206,8 +206,8 @@ void freezetag_Unfreeze(entity attacker)
 float freezetag_isEliminated(entity e)
 {
 	if(IS_PLAYER(e) && (e.frozen == 1 || e.deadflag != DEAD_NO))
-		return TRUE;
-	return FALSE;
+		return true;
+	return false;
 }
 
 
@@ -465,7 +465,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPreThink)
 			if(!o)
 				o = other;
 			if(self.frozen == 1)
-				other.reviving = TRUE;
+				other.reviving = true;
 			++n;
 		}
 	}
@@ -509,7 +509,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPreThink)
 			if(other.reviving)
 			{
 				other.revive_progress = self.revive_progress;
-				other.reviving = FALSE;
+				other.reviving = false;
 			}
 		}
 	}
@@ -536,7 +536,7 @@ MUTATOR_HOOKFUNCTION(freezetag_BotRoles)
 			self.havocbot_role = havocbot_role_ft_offense;
 	}
 
-	return TRUE;
+	return true;
 }
 
 MUTATOR_HOOKFUNCTION(freezetag_GetTeamCount)