X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fnix%2Fsv_nix.qc;h=a06f5364d4473bf673cfcfa29aff140c8f3442de;hp=b33cd732fa8a500e97609457de7613f24fe1c815;hb=87bec07409c336c956a798556064c6819ad40a4d;hpb=3bbcff2475d1b2efc1314a358bf60c6fba6e4be6

diff --git a/qcsrc/common/mutators/mutator/nix/sv_nix.qc b/qcsrc/common/mutators/mutator/nix/sv_nix.qc
index b33cd732fa..a06f5364d4 100644
--- a/qcsrc/common/mutators/mutator/nix/sv_nix.qc
+++ b/qcsrc/common/mutators/mutator/nix/sv_nix.qc
@@ -255,24 +255,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.instanceOfPowerup)
+	{
+		return !autocvar_g_nix_with_powerups;
 	}
 
 	return true; // delete all other items