X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_nix.qc;h=f239dbbf635d17623c2e2d20fcdb164a932a3914;hb=2671dcbe85ad0122d0ab0fe63c73443ab5ccf6d1;hp=a0ec6adaa020ca3d2273ee988886fe1e642d14d0;hpb=244e5081c5c503c307e557c98ac864f6c9731475;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator_nix.qc b/qcsrc/server/mutators/mutator_nix.qc
index a0ec6adaa..f239dbbf6 100644
--- a/qcsrc/server/mutators/mutator_nix.qc
+++ b/qcsrc/server/mutators/mutator_nix.qc
@@ -1,6 +1,10 @@
+#include "../_all.qh"
+
+#include "mutator.qh"
+
 float g_nix_with_blaster;
 // WEAPONTODO
-float nix_weapon;
+int nix_weapon;
 float nix_nextchange;
 float nix_nextweapon;
 .float nix_lastchange_id;
@@ -20,7 +24,7 @@ float NIX_CanChooseWeapon(float wpn)
 	}
 	else
 	{
-		if(wpn == WEP_BLASTER && g_nix_with_blaster) // WEAPONTODO: rename to g_nix_with_blaster
+		if(wpn == WEP_BLASTER.m_id && g_nix_with_blaster) // WEAPONTODO: rename to g_nix_with_blaster
 			return false;
 		if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
 			return false;
@@ -176,16 +180,19 @@ MUTATOR_HOOKFUNCTION(nix_FilterItem)
 {
 	switch (self.items)
 	{
-		case IT_HEALTH:
-		case IT_5HP:
-		case IT_25HP:
-		case IT_ARMOR:
-		case IT_ARMOR_SHARD:
+		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 0;
 			break;
-		case IT_STRENGTH:
-		case IT_INVINCIBLE:
+		case ITEM_Strength.m_itemid:
+		case ITEM_Shield.m_itemid:
 			if (autocvar_g_nix_with_powerups)
 				return 0;
 			break;