X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fnexball%2Fnexball.qc;h=0d56d37155b0359113d2e096e83619c6568a722d;hp=2206df7c695d00ae25f493fbdd9f4eadeacf6121;hb=f3b08f163992b7be4e597cdd2297ed193d96dc1c;hpb=d8ae277d6bc59894ee3db414307854a1c803d849

diff --git a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
index 2206df7c6..0d56d3715 100644
--- a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
+++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
@@ -180,12 +180,12 @@ void GiveBall(entity plyr, entity ball)
 	}
 
 	plyr.(weaponentity).weapons = plyr.weapons;
-	plyr.(weaponentity).switchweapon = plyr.weapon;
+	plyr.(weaponentity).m_switchweapon = Weapons_from(plyr.weapon);
 	plyr.weapons = WEPSET(NEXBALL);
 	setself(plyr);
 	Weapon w = WEP_NEXBALL;
 	w.wr_resetplayer(w);
-	plyr.switchweapon = WEP_NEXBALL.m_id;
+	PS(plyr).m_switchweapon = WEP_NEXBALL;
 	W_SwitchWeapon(WEP_NEXBALL);
 	setself(this);
 }
@@ -971,8 +971,8 @@ MUTATOR_HOOKFUNCTION(nb, PlayerPreThink)
 				self.weapons = self.(weaponentity).weapons;
 				Weapon w = WEP_NEXBALL;
 				w.wr_resetplayer(w);
-				self.switchweapon = self.(weaponentity).switchweapon;
-				W_SwitchWeapon(Weapons_from(self.switchweapon));
+				PS(self).m_switchweapon = self.(weaponentity).m_switchweapon;
+				W_SwitchWeapon(PS(self).m_switchweapon);
 
 				self.(weaponentity).weapons = '0 0 0';
 			}