From 14f79319c39d6fac942708debe25427aabbdf28c Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 10 Feb 2013 18:50:16 +0100 Subject: [PATCH] Fix fo bug #1390: "If sv_ready_restart_after_countdown 1 is set, the scoreboard points are not reset to 0, when map is restarted via F4. - needs g_warmup 1 set as well". This also fixes sv_ready_restart_repeatable not working if sv_ready_restart_after_countdown 1 is set (when everyone is ready console shows "Server is restarting" but nothing happens). Note that this issue doesn't exist in Arena as map is restarted via the console command "restart", and warmup stage isn't allowed. --- qcsrc/server/command/vote.qc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 45e15c95f..ad44e9382 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -424,7 +424,7 @@ void ReadyRestart_force() readyrestart_happened = 1; game_starttime = time; - if(!g_ca && !g_arena) { game_starttime += RESTART_COUNTDOWN; } + if(!g_arena) { game_starttime += RESTART_COUNTDOWN; } // clear alivetime FOR_EACH_CLIENT(tmp_player) @@ -444,14 +444,14 @@ void ReadyRestart_force() Nagger_ReadyCounted(); // NOTE: this causes a resend of that entity, and will also turn off warmup state on the client // lock teams with lockonrestart - if(autocvar_teamplay_lockonrestart && teamplay) + if(autocvar_teamplay_lockonrestart && teamplay) { lockteams = 1; bprint("^1The teams are now locked.\n"); } //initiate the restart-countdown-announcer entity - if(autocvar_sv_ready_restart_after_countdown && !g_ca && !g_arena) + if(autocvar_sv_ready_restart_after_countdown && !g_arena) { restart_timer = spawn(); restart_timer.think = ReadyRestart_think; -- 2.39.2