From: Mario Date: Thu, 6 Jun 2013 18:02:35 +0000 (+1000) Subject: Add warmup support to minstagib X-Git-Tag: xonotic-v0.8.0~366^2~29 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8e1d755014a87dc51d8330c49fc7e1a151d482ca;p=xonotic%2Fxonotic-data.pk3dir.git Add warmup support to minstagib --- diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index d0a0a84a5..5a5a91136 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_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 a0786b7da..4a26bdb5f 100644 --- 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;