GameRules: make `GameRules_teams(true)` imply `have_team_spawns = -1`

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator / gamemode_keyhunt.qh

diff --git a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qh b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qh
index 9a98df98fda007eee44fc3e982da116b8a3584d2..5b0fb5bbbddcfda065e6cdb3576d6050cb013929 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qh
+++ b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qh
@@ -15,10 +15,10 @@ REGISTER_MUTATOR(kh, false)
                        error("This is a game type and it cannot be added at runtime.");
                kh_Initialize();
 
-               ActivateTeamplay();
-               SetLimits(autocvar_g_keyhunt_point_limit, autocvar_g_keyhunt_point_leadlimit, autocvar_timelimit_override, -1);
-               if (autocvar_g_keyhunt_team_spawns)
-                       have_team_spawns = -1; // request team spawns
+               GameRules_teams(true);
+        GameRules_limit_score(autocvar_g_keyhunt_point_limit);
+        GameRules_limit_lead(autocvar_g_keyhunt_point_leadlimit);
+        GameRules_spawning_teams(autocvar_g_keyhunt_team_spawns);
        }
 
        MUTATOR_ONROLLBACK_OR_REMOVE
@@ -42,9 +42,8 @@ REGISTER_MUTATOR(kh, false)
 // ALL OF THESE should be removed in the future, as other code should not have to care
 
 // used by bots:
-float kh_tracking_enabled;
+bool kh_tracking_enabled;
 .entity kh_next;
-float kh_Key_AllOwnedByWhichTeam();
 
 USING(kh_Think_t, void());
 void kh_StartRound();