From b6e9ede0a2a2200bcb42a1ddc9919ecfdd515d37 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Tue, 25 Jan 2011 18:51:47 +0200 Subject: [PATCH] Fully fix Electro ammo checks --- qcsrc/server/w_electro.qc | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index f5291822b..e14064ef0 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -473,9 +473,25 @@ float w_electro(float req) } else if (req == WR_THINK) { - if(autocvar_g_balance_electro_reload_ammo && self.clip_load < min(autocvar_g_balance_electro_primary_ammo, autocvar_g_balance_electro_secondary_ammo)) // forced reload - W_Electro_Reload(); - else if (self.BUTTON_ATCK) + if(autocvar_g_balance_electro_reload_ammo) // forced reload + { + if(autocvar_g_balance_electro_lightning) + { + if(self.clip_load > 0) + ammo_amount = 1; + } + else if(self.clip_load >= autocvar_g_balance_electro_primary_ammo) + ammo_amount = 1; + if(self.clip_load >= autocvar_g_balance_electro_secondary_ammo) + ammo_amount += 1; + + if(!ammo_amount) + { + W_Electro_Reload(); + return FALSE; + } + } + if (self.BUTTON_ATCK) { if(autocvar_g_balance_electro_lightning) if(self.BUTTON_ATCK_prev) -- 2.39.2