Properly check the amount of ammo we'd be using too

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index a2cf7bdac9dc03ea4b4c66cf2e7856c8e6859bfa..a44c5badaddf787cadbee5b1cb8ea6a78bd9de19 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -223,7 +223,7 @@ float w_shotgun(float req)
        else if (req == WR_CHECKAMMO1)
        {
                if(autocvar_g_balance_shotgun_reload_ammo)
-                       return self.shotgun_load;
+                       return self.shotgun_load >= autocvar_g_balance_shotgun_primary_ammo;
                else
                        return self.ammo_shells >= autocvar_g_balance_shotgun_primary_ammo;
        }

diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc
index c1b9386f4832570051199937dd5407a80bd147ea..f62aeabf64faa33e1ee590e8994cddd18ee3c511 100644 (file)
--- a/qcsrc/server/w_sniperrifle.qc
+++ b/qcsrc/server/w_sniperrifle.qc
@@ -275,14 +275,14 @@ float w_sniperrifle(float req)
        else if (req == WR_CHECKAMMO1)
        {
                if(autocvar_g_balance_sniperrifle_reload_ammo)
-                       return self.sniperrifle_load;
+                       return self.sniperrifle_load >= autocvar_g_balance_sniperrifle_primary_ammo;
                else
                        return self.ammo_nails >= autocvar_g_balance_sniperrifle_primary_ammo;
        }
        else if (req == WR_CHECKAMMO2)
        {
                if(autocvar_g_balance_sniperrifle_reload_ammo)
-                       return self.sniperrifle_load;
+                       return self.sniperrifle_load >= autocvar_g_balance_sniperrifle_secondary_ammo;
                else
                        return self.ammo_nails >= autocvar_g_balance_sniperrifle_secondary_ammo;
        }