From a3e036cb4521be79337e29ea91488a663821b519 Mon Sep 17 00:00:00 2001 From: Freddy Date: Tue, 18 Oct 2016 01:02:36 +0200 Subject: [PATCH] Replace m_itemid with itemdef for nix item filter --- qcsrc/common/mutators/mutator/nix/sv_nix.qc | 23 ++++++--------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/qcsrc/common/mutators/mutator/nix/sv_nix.qc b/qcsrc/common/mutators/mutator/nix/sv_nix.qc index 39072cefc..ded7f72eb 100644 --- a/qcsrc/common/mutators/mutator/nix/sv_nix.qc +++ b/qcsrc/common/mutators/mutator/nix/sv_nix.qc @@ -232,24 +232,13 @@ MUTATOR_HOOKFUNCTION(nix, FilterItem) { entity item = M_ARGV(0, entity); - switch (item.items) + if(item.itemdef.instanceOfHealth || item.itemdef.instanceOfArmor) { - case ITEM_HealthSmall.m_itemid: - case ITEM_HealthMedium.m_itemid: - case ITEM_HealthLarge.m_itemid: - case ITEM_HealthMega.m_itemid: - case ITEM_ArmorSmall.m_itemid: - case ITEM_ArmorMedium.m_itemid: - case ITEM_ArmorLarge.m_itemid: - case ITEM_ArmorMega.m_itemid: - if (autocvar_g_nix_with_healtharmor) - return false; - break; - case ITEM_Strength.m_itemid: - case ITEM_Shield.m_itemid: - if (autocvar_g_nix_with_powerups) - return false; - break; + return !autocvar_g_nix_with_healtharmor; + } + else if(item.itemdef == ITEM_Strength || item.itemdef == ITEM_Shield) + { + return !autocvar_g_nix_with_powerups; } return true; // delete all other items -- 2.39.2