always check the nex primary ammo when trying to charge. We don't want to allow switc...

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index 2d0cc7a603728cc54693d7354562b144008a202e..97cdaae3e890dd7a599fa46ef0dbeeff93dd1c78 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -175,9 +175,7 @@ float w_nex(float req)
        {
                if(cvar("g_balance_nex_secondary_charge_pool"))
                        return TRUE;
-               if(cvar("g_balance_nex_secondary_charge") && cvar("g_balance_nex_secondary_ammo")) // if charge consumes ammo, don't allow consuming so much that we cant fire a primary anymore
-                       return self.ammo_cells >= cvar("g_balance_nex_primary_ammo");
-               return self.ammo_cells >= cvar("g_balance_nex_secondary_ammo");
+               return self.ammo_cells >= cvar("g_balance_nex_primary_ammo"); // don't allow charging if we don't have enough ammo
        }
        return TRUE;
 };