Properly take ammo bounds when checking for forced reload

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index 26746a1e7618e2cfb30b54fa24cdaa30d6e7544b..055376543ed220dc8762fefbc126f3de816d3bd4 100644 (file)
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -361,7 +361,7 @@ float w_glauncher(float req)
        }
        else if (req == WR_THINK)
        {
-               if(autocvar_g_balance_grenadelauncher_reload_ammo && self.clip_load <= 0) // forced reload
+               if(autocvar_g_balance_grenadelauncher_reload_ammo && self.clip_load < min(autocvar_g_balance_grenadelauncher_primary_ammo, autocvar_g_balance_grenadelauncher_secondary_ammo)) // forced reload
                        W_GrenadeLauncher_Reload();
                else if (self.BUTTON_ATCK)
                {

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index 75d50d21059ebe294094c35cdc4c4efd558ec5b9..76b47c6bd7e9fa7ee48be4d2d7b93f76c5a19500 100644 (file)
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -433,7 +433,7 @@ float w_minelayer(float req)
        }
        else if (req == WR_THINK)
        {
-               if(autocvar_g_balance_minelayer_reload_ammo && self.clip_load <= 0) // forced reload
+               if(autocvar_g_balance_minelayer_reload_ammo && self.clip_load < autocvar_g_balance_minelayer_ammo) // forced reload
                        W_MineLayer_Reload();
                else if (self.BUTTON_ATCK)
                {

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 54043a9b430d8b92130fb58ed496b184821f25ab..2d26b183d2441f465d3ee2e500b9349052645b75 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -176,7 +176,7 @@ float w_shotgun(float req)
                        self.BUTTON_ATCK = bot_aim(1000000, 0, 0.001, FALSE);
        else if (req == WR_THINK)
        {
-               if(autocvar_g_balance_shotgun_reload_ammo && self.clip_load <= 0) // forced reload
+               if(autocvar_g_balance_shotgun_reload_ammo && self.clip_load < autocvar_g_balance_shotgun_primary_ammo) // forced reload
                        W_Shotgun_Reload();
                else
                {

diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc
index 22da48052d8be028f46cb2f40a0a9bca84e18676..9df76a95170afd723586bfa5897b7d146ea6b528 100644 (file)
--- a/qcsrc/server/w_sniperrifle.qc
+++ b/qcsrc/server/w_sniperrifle.qc
@@ -199,7 +199,7 @@ float w_sniperrifle(float req)
        }
        else if (req == WR_THINK)
        {
-               if(autocvar_g_balance_sniperrifle_reload_ammo && self.clip_load <= 0) // forced reload
+               if(autocvar_g_balance_sniperrifle_reload_ammo && self.clip_load < min(autocvar_g_balance_sniperrifle_primary_ammo, autocvar_g_balance_sniperrifle_secondary_ammo)) // forced reload
             W_SniperRifle_Reload();
                else
                {

diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc
index c348f7d60d8f7cf8e83e615f878267708815741a..8681c204cdd5009f9bff4ed89c96d177de7d4e1b 100644 (file)
--- a/qcsrc/server/w_uzi.qc
+++ b/qcsrc/server/w_uzi.qc
@@ -250,7 +250,7 @@ float w_uzi(float req)
                }
        else if (req == WR_THINK)
        {
-               if(autocvar_g_balance_uzi_reload_ammo && self.clip_load <= 0) // forced reload
+               if(autocvar_g_balance_uzi_reload_ammo && self.clip_load < min(max(autocvar_g_balance_uzi_sustained_ammo, autocvar_g_balance_uzi_first_ammo), autocvar_g_balance_uzi_burst_ammo)) // forced reload
                        W_Uzi_Reload();
                else if(autocvar_g_balance_uzi_mode == 1)
                {