Clean out self use from the weapon selection code

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / nexball / nexball.qc

diff --git a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
index dd844e77ea5231a5e01172c53ec6198ff196366c..184055d55b23ec670939a763b842cf3c354a25ca 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
+++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
@@ -188,7 +188,7 @@ void GiveBall(entity plyr, entity ball)
        Weapon w = WEP_NEXBALL;
        w.wr_resetplayer(w);
        PS(plyr).m_switchweapon = WEP_NEXBALL;
-       W_SwitchWeapon(WEP_NEXBALL);
+       W_SwitchWeapon(plyr, WEP_NEXBALL);
        setself(this);
 }
 
@@ -985,7 +985,7 @@ MUTATOR_HOOKFUNCTION(nb, PlayerPreThink)
                                Weapon w = WEP_NEXBALL;
                                w.wr_resetplayer(w);
                                PS(self).m_switchweapon = self.(weaponentity).m_switchweapon;
-                               W_SwitchWeapon(PS(self).m_switchweapon);
+                               W_SwitchWeapon(self, PS(self).m_switchweapon);
 
                                self.(weaponentity).weapons = '0 0 0';
                        }