From: Mario <zacjardine@y7mail.com>
Date: Thu, 11 Oct 2018 06:18:51 +0000 (+1000)
Subject: Remove g_duel_warmup (XPM ruleset turns on warmup when executed)
X-Git-Tag: xonotic-v0.8.5~1783
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1065c8d215b91408a7f70ae76546e70675885cff;p=xonotic%2Fxonotic-data.pk3dir.git

Remove g_duel_warmup (XPM ruleset turns on warmup when executed)
---

diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg
index 1ceea67f0..57c9f7b70 100644
--- 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 ab01f64ee..fc662e2a9 100644
--- 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 705bedc47..d255c9b35 100644
--- 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;