Weapons: remove useless weapon return values and implementations

[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 bdcb9ee8f70532a2450ef4f09a26f3428ed405f4..5d034870e67a0418c9814d3d18ca3158f07b2d85 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);
@@ -841,10 +842,10 @@ float ball_customize()
        return true;
 }
 
-       METHOD(BallStealer, wr_think, bool(BallStealer thiswep, bool fire1, bool fire2))
+       METHOD(BallStealer, wr_think, void(BallStealer thiswep, bool fire1, bool fire2))
        {
                if(fire1)
-                       if(weapon_prepareattack(0, autocvar_g_balance_nexball_primary_refire))
+                       if(weapon_prepareattack(false, autocvar_g_balance_nexball_primary_refire))
                                if(autocvar_g_nexball_basketball_meter)
                                {
                                        if(self.ballcarried && !self.metertime)
@@ -858,7 +859,7 @@ float ball_customize()
                                        weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_nexball_primary_animtime, w_ready);
                                }
                if(fire2)
-                       if(weapon_prepareattack(1, autocvar_g_balance_nexball_secondary_refire))
+                       if(weapon_prepareattack(true, autocvar_g_balance_nexball_secondary_refire))
                        {
                                W_Nexball_Attack2();
                                weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_nexball_secondary_animtime, w_ready);
@@ -870,20 +871,10 @@ float ball_customize()
                        // DropBall or stealing will set metertime back to 0
                        weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_nexball_primary_animtime, w_ready);
                }
-               return true;
-       }
-       METHOD(BallStealer, wr_init, bool(BallStealer thiswep))
-       {
-               return true;
        }
-       METHOD(BallStealer, wr_setup, bool(BallStealer thiswep))
+       METHOD(BallStealer, wr_setup, void(BallStealer thiswep))
        {
                //weapon_setup(WEP_PORTO.m_id);
-               return true;
-       }
-       METHOD(BallStealer, wr_aim, bool(BallStealer thiswep))
-       {
-               return true;
        }
        METHOD(BallStealer, wr_checkammo1, bool(BallStealer thiswep))
        {
@@ -951,7 +942,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);