From 39da97bf0af33cfa714df20ef7aeacc2e4675c1c Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Fri, 21 Jan 2011 23:33:10 +0200 Subject: [PATCH] Properly take ammo bounds when checking for forced reload --- qcsrc/server/w_grenadelauncher.qc | 2 +- qcsrc/server/w_minelayer.qc | 2 +- qcsrc/server/w_shotgun.qc | 2 +- qcsrc/server/w_sniperrifle.qc | 2 +- qcsrc/server/w_uzi.qc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc index 26746a1e7..055376543 100644 --- 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 75d50d210..76b47c6bd 100644 --- 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 54043a9b4..2d26b183d 100644 --- 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 22da48052..9df76a951 100644 --- 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 c348f7d60..8681c204c 100644 --- 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) { -- 2.39.2