Weapons: remove WEP_ACTION

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / gamemode_nexball.qc

diff --git a/qcsrc/server/mutators/gamemode_nexball.qc b/qcsrc/server/mutators/gamemode_nexball.qc
index b50ba97cdaa44ce9e50361a5de1359cb3597549d..590968290b2189bcea2c0bafaa0a257c525e605d 100644 (file)
--- a/qcsrc/server/mutators/gamemode_nexball.qc
+++ b/qcsrc/server/mutators/gamemode_nexball.qc
@@ -170,7 +170,8 @@ void GiveBall(entity plyr, entity ball)
        plyr.weaponentity.switchweapon = plyr.weapon;
        plyr.weapons = WEPSET_NEXBALL;
        setself(plyr);
-       WEP_ACTION(WEP_NEXBALL, WR_RESETPLAYER);
+       Weapon w = WEP_NEXBALL;
+       w.wr_resetplayer(w);
        plyr.switchweapon = WEP_NEXBALL.m_id;
        W_SwitchWeapon(WEP_NEXBALL.m_id);
        setself(this);
@@ -951,7 +952,8 @@ MUTATOR_HOOKFUNCTION(nexball_PlayerPreThink)
                        if(self.weaponentity.weapons)
                        {
                                self.weapons = self.weaponentity.weapons;
-                               WEP_ACTION(WEP_NEXBALL, WR_RESETPLAYER);
+                               Weapon w = WEP_NEXBALL;
+                               w.wr_resetplayer(w);
                                self.switchweapon = self.weaponentity.switchweapon;
                                W_SwitchWeapon(self.switchweapon);