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 7b2203c39056607559805bd81c9cd0a4c793d188..530e8881891057894e6437094d58ef4954641c1f 100644 (file)
--- 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 0f771411aaee48c5a72ad7a5747750a7ef77e7a2..c2f2c0508ea16e28b3d3e0738949a6efb1cc4779 100644 (file)
--- 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 d255c9b3532ebcd37db5c849abd668979a0bd7aa..705bedc47e9a3e9a5e644c6ab860fd108c3530b3 100644 (file)
--- 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;