From 1065c8d215b91408a7f70ae76546e70675885cff Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 11 Oct 2018 16:18:51 +1000 Subject: [PATCH] Remove g_duel_warmup (XPM ruleset turns on warmup when executed) --- gamemodes-server.cfg | 2 +- qcsrc/common/gamemodes/gamemode/duel/sv_duel.qc | 7 ------- qcsrc/common/gamemodes/gamemode/duel/sv_duel.qh | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg index 1ceea67f09..57c9f7b708 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 ab01f64ee7..fc662e2a9f 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 705bedc47e..d255c9b353 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; -- 2.39.2