Fix some ammo config issues

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index d46342ccc25d19c9c24cfc3ec914ba8e6cd620be..2f1bbfa3b375d0f4a0dda08918f0625ab18a6e99 100644 (file)
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -488,9 +488,18 @@ float w_minelayer(float req)
        else if (req == WR_CHECKAMMO1)
        {
                // don't switch while placing a mine
-               if ((ATTACK_FINISHED(self) <= time || self.weapon != WEP_MINE_LAYER)
-                       && self.ammo_rockets < autocvar_g_balance_minelayer_ammo)
-                       return FALSE;
+               if(autocvar_g_balance_electro_reload_ammo)
+               {
+                       if ((ATTACK_FINISHED(self) <= time || self.weapon != WEP_MINE_LAYER)
+                               && self.clip_load < autocvar_g_balance_minelayer_ammo)
+                               return FALSE;
+               }
+               else
+               {
+                       if ((ATTACK_FINISHED(self) <= time || self.weapon != WEP_MINE_LAYER)
+                               && self.ammo_rockets < autocvar_g_balance_minelayer_ammo)
+                               return FALSE;
+               }
        }
        else if (req == WR_CHECKAMMO2)
        {

diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc
index 826aa8d8dce435f4dfc474974482e34aebe5b2b5..7577495f816ffdc50aca31200d2f02d2f2c60f4a 100644 (file)
--- a/qcsrc/server/w_sniperrifle.qc
+++ b/qcsrc/server/w_sniperrifle.qc
@@ -264,7 +264,7 @@ float w_sniperrifle(float req)
        else if (req == WR_CHECKAMMO2)
        {
                if(autocvar_g_balance_sniperrifle_reload_ammo)
-                       return self.sniperrifle_load >= autocvar_g_balance_sniperrifle_primary_ammo;
+                       return self.sniperrifle_load >= autocvar_g_balance_sniperrifle_secondary_ammo;
                else
                        return self.ammo_nails >= autocvar_g_balance_sniperrifle_secondary_ammo;
        }