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=76e735e5505b482a34df8cd32d09847a6a21b58b;hp=39072cefc7d2ba0ab9697a9f3a104599b2a40dc9;hb=429e52163f53e75b848135f076b77c4eb43935ac;hpb=dfd83905b964f87db1a9b206767a5b207991038a

diff --git a/qcsrc/common/mutators/mutator/nix/sv_nix.qc b/qcsrc/common/mutators/mutator/nix/sv_nix.qc
index 39072cefc7..76e735e550 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.instanceOfPowerup)
+	{
+		return !autocvar_g_nix_with_powerups;
 	}
 
 	return true; // delete all other items
@@ -267,7 +256,7 @@ MUTATOR_HOOKFUNCTION(nix, PlayerPreThink)
 {
 	entity player = M_ARGV(0, entity);
 
-	if(!intermission_running)
+	if(!gameover)
 	if(!IS_DEAD(player))
 	if(IS_PLAYER(player))
 		NIX_GiveCurrentWeapon(player);