Add warmup support to minstagib

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index d0a0a84a54675e86b3a8d0c2aeee97f624d23b1d..5a5a91136592b302ecd8ba6431a62814ff32692a 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");
 
-       if ((g_race && g_race_qualifying == 2) || g_arena || g_minstagib || g_assault || cvar("g_campaign") || cvar("g_melee_only"))
+       if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || cvar("g_campaign") || cvar("g_melee_only"))
                inWarmupStage = 0; // these modes cannot work together, sorry
 
        g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon");

diff --git a/qcsrc/server/mutators/mutator_minstagib.qc b/qcsrc/server/mutators/mutator_minstagib.qc
index a0786b7dabfee8c9369eef9f591cf33467075cd4..4a26bdb5fd37665e548b4524baeaa41e344eb088 100644 (file)
--- a/qcsrc/server/mutators/mutator_minstagib.qc
+++ b/qcsrc/server/mutators/mutator_minstagib.qc
@@ -275,6 +275,7 @@ MUTATOR_HOOKFUNCTION(minstagib_SetStartItems)
        start_health = 100;
        start_armorvalue = 0;
        WEPSET_COPY_AW(start_weapons, WEP_MINSTANEX);
+       WEPSET_COPY_AW(warmup_start_weapons, WEP_MINSTANEX);
        start_items |= IT_UNLIMITED_SUPERWEAPONS;
                
        return FALSE;