Add a check that was still necessary

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

diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc
index 23a0609a7a8bd6397614757b841a47156d810731..5c6b49c0bf551eb762a468f02d7ad163ec760ba2 100644 (file)
--- a/qcsrc/server/w_sniperrifle.qc
+++ b/qcsrc/server/w_sniperrifle.qc
@@ -256,11 +256,17 @@ float w_sniperrifle(float req)
        }
        else if (req == WR_CHECKAMMO1)
        {
-               return self.ammo_nails >= autocvar_g_balance_sniperrifle_primary_ammo;
+               if(autocvar_g_balance_sniperrifle_reload_ammo)
+                       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)
        {
-               return self.ammo_nails >= autocvar_g_balance_sniperrifle_secondary_ammo;
+               if(autocvar_g_balance_sniperrifle_reload_ammo)
+                       return self.sniperrifle_load >= autocvar_g_balance_sniperrifle_primary_ammo;
+               else
+                       return self.ammo_nails >= autocvar_g_balance_sniperrifle_secondary_ammo;
        }
        else if (req == WR_RELOAD)
        {