From: Mario <mario@smbclan.net>
Date: Mon, 1 Oct 2018 05:34:58 +0000 (+1000)
Subject: Add an option (enabled by default) to configure whether the duel gamemode has a warmup
X-Git-Tag: xonotic-v0.8.5~1800
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=df7b50ddce68cfa35cba3f6f3d6a22dcfc6db747;p=xonotic%2Fxonotic-data.pk3dir.git

Add an option (enabled by default) to configure whether the duel gamemode has a warmup
---

diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg
index 7b2203c39..530e88818 100644
--- a/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@ -539,4 +539,5 @@ set g_invasion_type 0 "type of invasion mode - 0: round-based, 1: hunting, 2: co
 //  duel
 // ======
 set g_duel 0 "Duel: frag the opponent more in a one versus one arena battle"
+set g_duel_warmup 1 "Have a short warmup period before beginning the actual duel"
 set g_duel_with_powerups 0 "Enable powerups to spawn in the duel gamemode"
diff --git a/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qc b/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qc
index 0f771411a..c2f2c0508 100644
--- a/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qc
+++ b/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qc
@@ -2,7 +2,8 @@
 
 MUTATOR_HOOKFUNCTION(duel, ReadLevelCvars)
 {
-	warmup_stage = 1;
+	if(autocvar_g_duel_warmup)
+		warmup_stage = 1; // otherwise allow it if it's enabled
 	//sv_ready_restart_after_countdown = 0;
 }
 
diff --git a/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qh b/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qh
index d255c9b35..705bedc47 100644
--- a/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qh
+++ b/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qh
@@ -8,3 +8,4 @@ REGISTER_MUTATOR(duel, false)
 }
 
 bool autocvar_g_duel_with_powerups;
+bool autocvar_g_duel_warmup = true;