]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Replace m_itemid with itemdef for nix item filter
authorFreddy <schro.sb@gmail.com>
Mon, 17 Oct 2016 23:02:36 +0000 (01:02 +0200)
committerFreddy <schro.sb@gmail.com>
Mon, 17 Oct 2016 23:02:36 +0000 (01:02 +0200)
qcsrc/common/mutators/mutator/nix/sv_nix.qc

index 39072cefc7d2ba0ab9697a9f3a104599b2a40dc9..ded7f72eb1ec0f443fc2203ab923434cb72caab2 100644 (file)
@@ -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