Merge branch 'TimePath/killself' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator / gamemode_ca.qc

diff --git a/qcsrc/server/mutators/mutator/gamemode_ca.qc b/qcsrc/server/mutators/mutator/gamemode_ca.qc
index 9a9d228809552eb2c79c131577b6aa87b3fef455..8835d11a9cdaac326642cb9811bfb2986dd699af 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_ca.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_ca.qc
@@ -47,7 +47,7 @@ REGISTER_MUTATOR(ca, false)
                EliminatedPlayers_Init(ca_isEliminated);
 
                ActivateTeamplay();
-               SetLimits(autocvar_g_ca_point_limit, autocvar_g_ca_point_leadlimit, -1, -1);
+               SetLimits(autocvar_g_ca_point_limit, autocvar_g_ca_point_leadlimit, autocvar_timelimit_override, -1);
 
                if (autocvar_g_ca_team_spawns)
                        have_team_spawns = -1; // request team spawns
@@ -242,7 +242,6 @@ MUTATOR_HOOKFUNCTION(ca, PutClientInServer)
 
 MUTATOR_HOOKFUNCTION(ca, reset_map_players)
 {
-    SELFPARAM();
        FOREACH_CLIENT(true, {
                it.killcount = 0;
                if (!it.caplayer && IS_BOT_CLIENT(it))