X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_nexball.qc;h=2fdde9883792c217b3f7151112b26d3318f17f97;hb=ca811d45f7e7b64a01657b2252cab3cfdfedd970;hp=9844875b3d9eb27ac56efc69049e59aed1a70f2c;hpb=1d4454eb627b54e4b01a36ccce32a2767b02416c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/gamemode_nexball.qc b/qcsrc/server/mutators/gamemode_nexball.qc
index 9844875b3..2fdde9883 100644
--- a/qcsrc/server/mutators/gamemode_nexball.qc
+++ b/qcsrc/server/mutators/gamemode_nexball.qc
@@ -158,9 +158,9 @@ void GiveBall(entity plyr, entity ball)
 	self.weaponentity.weapons = self.weapons;
 	self.weaponentity.switchweapon = self.weapon;
 	self.weapons = WEPSET_PORTO;
-	WEP_ACTION(WEP_PORTO, WR_RESETPLAYER);
-	self.switchweapon = WEP_PORTO;
-	W_SwitchWeapon(WEP_PORTO);
+	WEP_ACTION(WEP_PORTO.m_id, WR_RESETPLAYER);
+	self.switchweapon = WEP_PORTO.m_id;
+	W_SwitchWeapon(WEP_PORTO.m_id);
 	self = ownr;
 }
 
@@ -873,7 +873,7 @@ float w_nexball_weapon(float req)
 	}
 	else if(req == WR_SETUP)
 	{
-		//weapon_setup(WEP_PORTO);
+		//weapon_setup(WEP_PORTO.m_id);
 	}
 	// No need to check WR_CHECKAMMO* or WR_AIM, it should always return true
 	return true;
@@ -936,7 +936,7 @@ MUTATOR_HOOKFUNCTION(nexball_PlayerPreThink)
 			if(self.weaponentity.weapons)
 			{
 				self.weapons = self.weaponentity.weapons;
-				WEP_ACTION(WEP_PORTO, WR_RESETPLAYER);
+				WEP_ACTION(WEP_PORTO.m_id, WR_RESETPLAYER);
 				self.switchweapon = self.weaponentity.switchweapon;
 				W_SwitchWeapon(self.switchweapon);
 
@@ -982,7 +982,7 @@ MUTATOR_HOOKFUNCTION(nexball_SetStartItems)
 
 MUTATOR_HOOKFUNCTION(nexball_ForbidThrowing)
 {
-	if(self.weapon == WEP_MORTAR)
+	if(self.weapon == WEP_MORTAR.m_id)
 		return true;
 
 	return false;
@@ -991,7 +991,7 @@ MUTATOR_HOOKFUNCTION(nexball_ForbidThrowing)
 MUTATOR_HOOKFUNCTION(nexball_FilterItem)
 {
 	if(self.classname == "droppedweapon")
-	if(self.weapon == WEP_MORTAR)
+	if(self.weapon == WEP_MORTAR.m_id)
 		return true;
 
 	return false;