Soft reset: Fix warmup limit and repeatable restart

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / command / sv_cmd.qc

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index e1070ad9ad51790792f95479bb376b8abb91d6ca..3e4195e509491e8cf41b9fcfb8850d63acab9228 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -163,8 +163,7 @@ void GameCommand_allready(int request)
                {
                        if(warmup_stage)
                        {
-                               warmup_stage = 0;
-                               ReadyRestart();
+                               ReadyRestart(true);
                        }
                        else
                                LOG_INFO("Not in warmup.");
@@ -1313,8 +1312,7 @@ void GameCommand_reset(int request)
        {
                case CMD_REQUEST_COMMAND:
                {
-                       warmup_stage = cvar("g_warmup");
-                       ReadyRestart();
+                       ReadyRestart(false);
                        return;
                }