From 7781ee1e0be7fb26f14bc6a9bcd05c385e820a00 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 7 Jun 2013 04:04:43 +1000 Subject: [PATCH] Add warmup support to melee only arena --- qcsrc/server/miscfunctions.qc | 2 +- qcsrc/server/mutators/mutator_melee_only.qc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 5a5a91136..ea7360835 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -969,7 +969,7 @@ void readlevelcvars(void) g_warmup_allguns = cvar("g_warmup_allguns"); g_warmup_allow_timeout = cvar("g_warmup_allow_timeout"); - if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || cvar("g_campaign") || cvar("g_melee_only")) + if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || cvar("g_campaign")) inWarmupStage = 0; // these modes cannot work together, sorry g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon"); diff --git a/qcsrc/server/mutators/mutator_melee_only.qc b/qcsrc/server/mutators/mutator_melee_only.qc index 85354bf4d..639bba507 100644 --- a/qcsrc/server/mutators/mutator_melee_only.qc +++ b/qcsrc/server/mutators/mutator_melee_only.qc @@ -1,8 +1,10 @@ MUTATOR_HOOKFUNCTION(melee_SetStartItems) { start_ammo_shells = 0; + warmup_start_ammo_shells = 0; WEPSET_COPY_AW(start_weapons, WEP_SHOTGUN); + WEPSET_COPY_AW(warmup_start_weapons, WEP_SHOTGUN); return FALSE; } -- 2.39.2