Campaign: make work resetmatch without entering warmup (if enabled in the server)

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 42d78dd0ac29dae5653e216bc227920eb4669f05..e94880c785164bf765deebbdf5eb77c56c5f2a75 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -486,7 +486,7 @@ void ReadyRestart(bool forceWarmupEnd)
        if (MUTATOR_CALLHOOK(ReadyRestart_Deny) || intermission_running || race_completing) localcmd("restart\n");
        else localcmd("\nsv_hook_readyrestart\n");
 
-       if(forceWarmupEnd)
+       if(forceWarmupEnd || autocvar_g_campaign)
                warmup_stage = 0; // forcefully end warmup and go to match stage
        else
                warmup_stage = cvar("g_warmup"); // go into warmup if it's enabled, otherwise restart into match stage