From: terencehill <piuntn@gmail.com>
Date: Tue, 12 Apr 2022 16:32:11 +0000 (+0200)
Subject: Campaign: make work resetmatch without entering warmup (if enabled in the server)
X-Git-Tag: xonotic-v0.8.5~77^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=64f02fb25661ce6301c0c4e30dfb3457dd2aa531;p=xonotic%2Fxonotic-data.pk3dir.git

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 42d78dd0a..e94880c78 100644
--- 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