X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_ca.qh;h=6d4786ee529acbf5d78cb70dc459acfde7e4cd0d;hb=f570e338e4f861aa53cd44a4014a077105cefe72;hp=8009feb8a569c252694450672b86367b5ced92be;hpb=868c953a2bff5ddb11700a7d160e66014d9704de;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator/gamemode_ca.qh b/qcsrc/server/mutators/mutator/gamemode_ca.qh
index 8009feb8a..6d4786ee5 100644
--- a/qcsrc/server/mutators/mutator/gamemode_ca.qh
+++ b/qcsrc/server/mutators/mutator/gamemode_ca.qh
@@ -6,7 +6,7 @@ int autocvar_g_ca_point_limit;
 int autocvar_g_ca_point_leadlimit;
 float autocvar_g_ca_round_timelimit;
 bool autocvar_g_ca_team_spawns;
-int autocvar_g_ca_teams;
+//int autocvar_g_ca_teams;
 int autocvar_g_ca_teams_override;
 float autocvar_g_ca_warmup;
 
@@ -21,8 +21,6 @@ bool CA_CheckWinner();
 void CA_RoundStart();
 bool ca_isEliminated(entity e);
 
-void SetLimits(int fraglimit_override, int leadlimit_override, float timelimit_override, float qualifying_override);
-
 REGISTER_MUTATOR(ca, false)
 {
 	MUTATOR_ONADD
@@ -33,7 +31,8 @@ REGISTER_MUTATOR(ca, false)
 		allowed_to_spawn = true;
 
 		ca_teams = autocvar_g_ca_teams_override;
-		if (ca_teams < 2) ca_teams = autocvar_g_ca_teams;
+		if (ca_teams < 2)
+			ca_teams = cvar("g_ca_teams"); // read the cvar directly as it gets written earlier in the same frame
 		ca_teams = bound(2, ca_teams, 4);
 
 		int teams = 0;
@@ -44,20 +43,20 @@ REGISTER_MUTATOR(ca, false)
 
 		ca_teams = teams; // now set it?
 
-        ScoreRules_basics(teams, SFL_SORT_PRIO_PRIMARY, 0, true);
-        ScoreInfo_SetLabel_TeamScore(ST_CA_ROUNDS, "rounds", SFL_SORT_PRIO_PRIMARY);
-        ScoreRules_basics_end();
+        GameRules_scoring(teams, SFL_SORT_PRIO_PRIMARY, 0, {
+            field_team(ST_CA_ROUNDS, "rounds", SFL_SORT_PRIO_PRIMARY);
+        });
 
 		round_handler_Spawn(CA_CheckTeams, CA_CheckWinner, CA_RoundStart);
 		round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit);
 
 		EliminatedPlayers_Init(ca_isEliminated);
 
-		ActivateTeamplay();
-		SetLimits(autocvar_g_ca_point_limit, autocvar_g_ca_point_leadlimit, autocvar_timelimit_override, -1);
+		GameRules_teams(true);
+        GameRules_limit_score(autocvar_g_ca_point_limit);
+        GameRules_limit_lead(autocvar_g_ca_point_leadlimit);
 
-		if (autocvar_g_ca_team_spawns)
-			have_team_spawns = -1; // request team spawns
+        GameRules_spawning_teams(autocvar_g_ca_team_spawns);
 	}
 
 	MUTATOR_ONREMOVE