From: Lyberta Date: Sun, 21 Jan 2018 07:05:42 +0000 (+0300) Subject: Disabled random start weapons in Melee only and NIX. X-Git-Tag: xonotic-v0.8.5~2379^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F519%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git Disabled random start weapons in Melee only and NIX. --- 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 ac06a8f77..d6796fc05 100644 --- a/qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc +++ b/qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc @@ -15,6 +15,11 @@ MUTATOR_HOOKFUNCTION(melee_only, SetWeaponArena) M_ARGV(0, string) = "off"; } +MUTATOR_HOOKFUNCTION(melee_only, ForbidRandomStartWeapons) +{ + return true; +} + MUTATOR_HOOKFUNCTION(melee_only, ForbidThrowCurrentWeapon) { return true; diff --git a/qcsrc/common/mutators/mutator/nix/sv_nix.qc b/qcsrc/common/mutators/mutator/nix/sv_nix.qc index 886740aed..eb14a3159 100644 --- a/qcsrc/common/mutators/mutator/nix/sv_nix.qc +++ b/qcsrc/common/mutators/mutator/nix/sv_nix.qc @@ -290,6 +290,11 @@ MUTATOR_HOOKFUNCTION(nix, PlayerPreThink) NIX_GiveCurrentWeapon(player); } +MUTATOR_HOOKFUNCTION(nix, ForbidRandomStartWeapons) +{ + return true; +} + MUTATOR_HOOKFUNCTION(nix, PlayerSpawn) { entity player = M_ARGV(0, entity);