Remove g_duel_warmup (XPM ruleset turns on warmup when executed)

diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg
index 1ceea67f0978cc48972e70ee0c093656aa5c6091..57c9f7b7086f2c8ce25ff9f25cf475c2664c334c 100644 (file)
--- a/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@ -540,5 +540,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_warmup 180 "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 ab01f64ee7dfefc6a5ebaaa15740fff29a3e498c..fc662e2a9fa826648cebfcb875b493ef1a4c40db 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qc
+++ b/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qc
@@ -1,12 +1,5 @@
 #include "sv_duel.qh"
 
-MUTATOR_HOOKFUNCTION(duel, ReadLevelCvars)
-{
-       if(autocvar_g_duel_warmup)
-               warmup_stage = 1; // otherwise allow it if it's enabled
-       //sv_ready_restart_after_countdown = 0;
-}
-
 MUTATOR_HOOKFUNCTION(duel, GetPlayerLimit)
 {
        M_ARGV(0, int) = 2; // duel is always 1v1!

diff --git a/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qh b/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qh
index 705bedc47e9a3e9a5e644c6ab860fd108c3530b3..d255c9b3532ebcd37db5c849abd668979a0bd7aa 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qh
+++ b/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qh
@@ -8,4 +8,3 @@ REGISTER_MUTATOR(duel, false)
 }
 
 bool autocvar_g_duel_with_powerups;
-bool autocvar_g_duel_warmup = true;