From: Mario Date: Mon, 3 Oct 2016 13:06:11 +0000 (+1000) Subject: Fix start items in some special arena mutators X-Git-Tag: xonotic-v0.8.2~561 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cf9f39fbb870c7ee24894056d62a42ffb1986c61;p=xonotic%2Fxonotic-data.pk3dir.git Fix start items in some special arena mutators --- diff --git a/qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc b/qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc index e07034baf..89fdfaf9e 100644 --- a/qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc +++ b/qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc @@ -2,7 +2,7 @@ REGISTER_MUTATOR(melee_only, cvar("g_melee_only") && !cvar("g_instagib") && !g_nexball); -MUTATOR_HOOKFUNCTION(melee_only, SetStartItems) +MUTATOR_HOOKFUNCTION(melee_only, SetStartItems, CBC_ORDER_LAST) { start_ammo_shells = warmup_start_ammo_shells = 0; start_weapons = warmup_start_weapons = WEPSET(SHOTGUN); diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc index ea7ed953c..572261528 100644 --- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc +++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc @@ -362,7 +362,7 @@ MUTATOR_HOOKFUNCTION(ok, SpectateCopy) client.ok_use_ammocharge = spectatee.ok_use_ammocharge; } -MUTATOR_HOOKFUNCTION(ok, SetStartItems) +MUTATOR_HOOKFUNCTION(ok, SetStartItems, CBC_ORDER_LAST) { WepSet ok_start_items = (WEPSET(MACHINEGUN) | WEPSET(VORTEX) | WEPSET(SHOTGUN));