From 4ddfd8e93db725ad6fd209de7d9b0a8054e18dda Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Sat, 22 Jan 2011 04:22:23 +0200 Subject: [PATCH] Fix some ammo config issues --- qcsrc/server/w_minelayer.qc | 15 ++++++++++++--- qcsrc/server/w_sniperrifle.qc | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc index d46342ccc..2f1bbfa3b 100644 --- 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 826aa8d8d..7577495f8 100644 --- 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; } -- 2.39.2