From b8ba78f2aba560460c45a58c3dbc922e24642c77 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 5 Mar 2012 13:35:12 +0100 Subject: [PATCH] fixes --- qcsrc/server/mutators/mutator_new_toys.qc | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/qcsrc/server/mutators/mutator_new_toys.qc b/qcsrc/server/mutators/mutator_new_toys.qc index ee2301170..5642cf1e5 100644 --- a/qcsrc/server/mutators/mutator_new_toys.qc +++ b/qcsrc/server/mutators/mutator_new_toys.qc @@ -84,7 +84,7 @@ float nt_IsNewToy(float w) switch(w) { case WEP_SEEKER: - case WEP_MINELAYER: + case WEP_MINE_LAYER: case WEP_HLAC: case WEP_RIFLE: return TRUE; @@ -181,20 +181,13 @@ MUTATOR_HOOKFUNCTION(nt_SetWeaponreplace) return 0; } -MUTATOR_HOOK(nt_FilterItem) +MUTATOR_HOOKFUNCTION(nt_FilterItem) { - if(nt_isNewToy(self.weapon)) + if(nt_IsNewToy(self.weapon)) self.item_pickupsound = "weapons/weaponpickup_new_toys.ogg"; return 0; } -void Is_New_Toy(w) -{ - entity e = get_weaponinfo(i); - if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED) - e.spawnflags &~= WEP_FLAG_MUTATORBLOCKED; -} - MUTATOR_DEFINITION(mutator_new_toys) { MUTATOR_HOOK(SetModname, nt_SetModname, CBC_ORDER_ANY); @@ -212,7 +205,7 @@ MUTATOR_DEFINITION(mutator_new_toys) // mark the guns as ok to use by e.g. impulse 99 float i; for(i = WEP_FIRST; i <= WEP_LAST; ++i) - if(nt_isNewToy(i)) + if(nt_IsNewToy(i)) get_weaponinfo(i).spawnflags &~= WEP_FLAG_MUTATORBLOCKED; } MUTATOR_ONREMOVE -- 2.39.2