X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_freezetag.qc;h=88afaa755d7b9f995419411e912d431b7d4ec166;hb=2b44eaacadad415ca88acf919baf4180f7add34d;hp=eeb6fd0e5a6b61d7034c752fb524d2bc602b47bb;hpb=0ef42fd969f0608f8dbf4086f569ad34ac0271d5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
index eeb6fd0e5..88afaa755 100644
--- a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
@@ -7,13 +7,6 @@ float autocvar_g_freezetag_round_timelimit;
 int autocvar_g_freezetag_teams_override;
 float autocvar_g_freezetag_warmup;
 
-void freezetag_ScoreRules(int teams)
-{
-	GameRules_scoring(teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, {
-	    field(SP_FREEZETAG_REVIVALS, "revivals", 0);
-	});
-}
-
 void freezetag_count_alive_players()
 {
 	total_players = redalive = bluealive = yellowalive = pinkalive = 0;
@@ -579,16 +572,11 @@ void freezetag_Initialize()
 	freezetag_teams = autocvar_g_freezetag_teams_override;
 	if(freezetag_teams < 2)
 		freezetag_teams = cvar("g_freezetag_teams"); // read the cvar directly as it gets written earlier in the same frame
-	freezetag_teams = bound(2, freezetag_teams, 4);
-
-	int teams = 0;
-	if(freezetag_teams >= 1) teams |= BIT(0);
-	if(freezetag_teams >= 2) teams |= BIT(1);
-	if(freezetag_teams >= 3) teams |= BIT(2);
-	if(freezetag_teams >= 4) teams |= BIT(3);
 
-	freezetag_teams = teams; // now set it?
-	freezetag_ScoreRules(freezetag_teams);
+	freezetag_teams = BITS(bound(2, freezetag_teams, 4));
+	GameRules_scoring(freezetag_teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, {
+	    field(SP_FREEZETAG_REVIVALS, "revivals", 0);
+	});
 
 	round_handler_Spawn(freezetag_CheckTeams, freezetag_CheckWinner, func_null);
 	round_handler_Init(5, autocvar_g_freezetag_warmup, autocvar_g_freezetag_round_timelimit);