X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_nix.qc;h=dc12b05209eccc70baa32187ab62b033eb8fb961;hb=786db02b0c9aa618c581b7c3fe7392ad114797d8;hp=d5f95bd3039465f4df277b7ec389f6909a37c549;hpb=4779c1bd8269aaca0d20e802c7e8e685602bb926;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator_nix.qc b/qcsrc/server/mutators/mutator_nix.qc
index d5f95bd30..dc12b0520 100644
--- a/qcsrc/server/mutators/mutator_nix.qc
+++ b/qcsrc/server/mutators/mutator_nix.qc
@@ -17,7 +17,7 @@ float NIX_CanChooseWeapon(float wpn)
 		return FALSE;
 	if(g_weaponarena)
 	{
-		if not(WEPSET_CONTAINS_AW(g_weaponarena_weapons, wpn))
+		if(!(g_weaponarena_weapons & WepSet_FromWeapon(wpn)))
 			return FALSE;
 	}
 	else
@@ -26,7 +26,7 @@ float NIX_CanChooseWeapon(float wpn)
 			return FALSE;
 		if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
 			return FALSE;
-		if not(e.spawnflags & WEP_FLAG_NORMAL)
+		if (!(e.spawnflags & WEP_FLAG_NORMAL))
 			return FALSE;
 	}
 	return TRUE;
@@ -136,10 +136,10 @@ void NIX_GiveCurrentWeapon()
 		self.nix_nextincr = time + autocvar_g_balance_nix_incrtime;
 	}
 
-	WEPSET_CLEAR_E(self);
+	self.weapons = '0 0 0';
 	if(g_nix_with_laser)
-		WEPSET_ANDNOT_EW(self, WEP_LASER);
-	WEPSET_OR_EW(self, nix_weapon);
+		self.weapons &= ~WEPSET_LASER;
+	self.weapons |= WepSet_FromWeapon(nix_weapon);
 
 	if(self.switchweapon != nix_weapon)
 		if(!client_hasweapon(self, self.switchweapon, TRUE, FALSE))
@@ -205,7 +205,7 @@ MUTATOR_HOOKFUNCTION(nix_PlayerPreThink)
 {
 	if(!intermission_running)
 	if(self.deadflag == DEAD_NO)
-	if(self.classname == "player")
+	if(IS_PLAYER(self))
 		NIX_GiveCurrentWeapon();
 	return 0;
 }
@@ -263,7 +263,7 @@ MUTATOR_DEFINITION(mutator_nix)
 			e.ammo_nails = start_ammo_nails;
 			e.ammo_rockets = start_ammo_rockets;
 			e.ammo_fuel = start_ammo_fuel;
-			WEPSET_COPY_EA(e, start_weapons);
+			e.weapons = start_weapons;
 			if(!client_hasweapon(e, e.weapon, TRUE, FALSE))
 				e.switchweapon = w_getbestweapon(self);
 		}