remove the wish_reload system again

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

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index b5056b052deef07c1719aa37ac27327ff75fb897..32d299b5308ce1aa4b5e4a697ea2ffceb9e8ec4e 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -243,6 +243,7 @@ void spawnfunc_weapon_minstanex (void); // defined in t_items.qc
 float minstanex_ammo;
 float w_minstanex(float req)
 {
+       float ammo_amount;
        if (req == WR_AIM)
        {
                if(self.ammo_cells > 0)
@@ -315,19 +316,17 @@ float w_minstanex(float req)
        }
        else if (req == WR_CHECKAMMO1)
        {
-               if(autocvar_g_balance_minstanex_reload_ammo)
-                       return self.clip_load >= minstanex_ammo;
-               else
-                       return self.ammo_cells >= minstanex_ammo;
+               ammo_amount = self.ammo_cells >= autocvar_g_balance_minstanex_ammo;
+               ammo_amount += (autocvar_g_balance_minstanex_reload_ammo && self.minstanex_load >= autocvar_g_balance_minstanex_ammo);
+               return ammo_amount;
        }
        else if (req == WR_CHECKAMMO2)
        {
                if(!autocvar_g_balance_minstanex_laser_ammo)
                        return TRUE;
-               if(autocvar_g_balance_minstanex_reload_ammo)
-                       return self.clip_load >= autocvar_g_balance_minstanex_laser_ammo;
-               else
-                       return self.ammo_cells >= autocvar_g_balance_minstanex_laser_ammo;
+               ammo_amount = self.ammo_cells >= autocvar_g_balance_minstanex_laser_ammo;
+               ammo_amount += (autocvar_g_balance_minstanex_reload_ammo && self.minstanex_load >= autocvar_g_balance_minstanex_laser_ammo);
+               return ammo_amount;
        }
        else if (req == WR_RESETPLAYER)
        {
@@ -337,21 +336,6 @@ float w_minstanex(float req)
        {
                W_Minstanex_Reload();
        }
-       else if (req == WR_SWITCHABLE)
-       {
-               // checks if this weapon can be switched to, when reloading is enabled
-               // returns true if there's either enough load in the weapon to use it,
-               // or we have enough ammo to reload the weapon to a usable point
-               float ammo_amount;
-               if(g_minstagib)
-                       ammo_amount = 1;
-               else
-                       ammo_amount = autocvar_g_balance_minstanex_ammo;
-               if(autocvar_g_balance_minstanex_laser_ammo)
-                       ammo_amount = min(ammo_amount, autocvar_g_balance_minstanex_laser_ammo);
-
-               return (autocvar_g_balance_minstanex_reload_ammo && self.minstanex_load >= ammo_amount) || self.ammo_cells >= ammo_amount;
-       }
        return TRUE;
 };
 #endif