Add warmup support to melee only arena

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 5a5a91136592b302ecd8ba6431a62814ff32692a..ea7360835e38f8b8d7ff5cee835440cfd6a93715 100644 (file)
--- 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");
 
        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");
                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 85354bf4daf078f207b55bde4c3a458637a48c3a..639bba507ce522f6e1eeebe4e33901da998e27dd 100644 (file)
--- 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;
 MUTATOR_HOOKFUNCTION(melee_SetStartItems)
 {
        start_ammo_shells = 0;

+       warmup_start_ammo_shells = 0;

        
        WEPSET_COPY_AW(start_weapons, WEP_SHOTGUN);
        
        WEPSET_COPY_AW(start_weapons, WEP_SHOTGUN);

+       WEPSET_COPY_AW(warmup_start_weapons, WEP_SHOTGUN);

                
        return FALSE;
 }
                
        return FALSE;
 }