Don't look at WR_SWITCHABLE Where we check ammo for firing. Everything is now as...

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index a6841d2d785d5eed7f7976644e98032cf1c5b497..5f8d8b0531bd75a57f04d554e966c0ac5d1f44cb 100644 (file)
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -1052,11 +1052,6 @@ float weapon_prepareattack_checkammo(float secondary)
        if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
        if (!weapon_action(self.weapon, WR_CHECKAMMO1 + secondary))
        {
-               // always allow reloadable weapons, even if we're out of ammo, since the weapon itself
-               // could still be loaded. The reload code takes care of the rest
-               if(weapon_action(self.weapon, WR_SWITCHABLE))
-                       return FALSE;
-
                // always keep the Mine Layer if we placed mines, so that we can detonate them
                local entity mine;
                if(self.weapon == WEP_MINE_LAYER)