From 068ce2c673f65ca69cbdc338f538e10cbaf7b2d8 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Mon, 24 Jan 2011 01:51:35 +0200 Subject: [PATCH] Fix Rocket Launcher and Mine Layer ammo check code --- qcsrc/server/w_minelayer.qc | 13 ++++++++----- qcsrc/server/w_rocketlauncher.qc | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc index 00a836eb8..b5ca7aa14 100644 --- a/qcsrc/server/w_minelayer.qc +++ b/qcsrc/server/w_minelayer.qc @@ -482,12 +482,15 @@ float w_minelayer(float req) // don't switch while placing a mine if (ATTACK_FINISHED(self) <= time || self.weapon != WEP_MINE_LAYER) { - if(self.ammo_rockets < autocvar_g_balance_minelayer_ammo) - ammo_amount = FALSE; - if(autocvar_g_balance_electro_reload_ammo && self.minelayer_load < autocvar_g_balance_minelayer_ammo) - ammo_amount = FALSE; + if(autocvar_g_balance_minelayer_reload_ammo) + { + if(self.ammo_rockets < autocvar_g_balance_minelayer_ammo && self.minelayer_load < autocvar_g_balance_minelayer_ammo) + ammo_amount = TRUE; + } + else if(self.ammo_rockets < autocvar_g_balance_minelayer_ammo) + ammo_amount = TRUE; + return !ammo_amount; } - return ammo_amount; } else if (req == WR_CHECKAMMO2) { diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc index 471350484..cb639430b 100644 --- a/qcsrc/server/w_rocketlauncher.qc +++ b/qcsrc/server/w_rocketlauncher.qc @@ -523,12 +523,15 @@ float w_rlauncher(float req) // don't switch while guiding a missile if (ATTACK_FINISHED(self) <= time || self.weapon != WEP_ROCKET_LAUNCHER) { - if(self.ammo_rockets < autocvar_g_balance_rocketlauncher_ammo) - ammo_amount = FALSE; - if(autocvar_g_balance_electro_reload_ammo && self.minelayer_load < autocvar_g_balance_rocketlauncher_ammo) - ammo_amount = FALSE; + if(autocvar_g_balance_rocketlauncher_reload_ammo) + { + if(self.ammo_rockets < autocvar_g_balance_rocketlauncher_ammo && self.rocketlauncher_load < autocvar_g_balance_rocketlauncher_ammo) + ammo_amount = TRUE; + } + else if(self.ammo_rockets < autocvar_g_balance_rocketlauncher_ammo) + ammo_amount = TRUE; + return !ammo_amount; } - return ammo_amount; } else if (req == WR_CHECKAMMO2) return FALSE; -- 2.39.2