From af3f4509724015a6e5de7f32b5c4e9f2c592e7c9 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Tue, 25 Jan 2011 18:07:31 +0200 Subject: [PATCH] Fix electro beam ammo check. Not fully ready --- qcsrc/server/w_electro.qc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index 295239150..61115b3a9 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -554,16 +554,18 @@ float w_electro(float req) else if (req == WR_CHECKAMMO1) { if(autocvar_g_balance_electro_lightning) + { ammo_amount = !autocvar_g_balance_electro_primary_ammo || (self.ammo_cells > 0); + if(autocvar_g_balance_electro_lightning) + ammo_amount += self.electro_load > 0; + } else - ammo_amount = self.ammo_cells >= autocvar_g_balance_electro_primary_ammo; - if(autocvar_g_balance_electro_reload_ammo) { + ammo_amount = self.ammo_cells >= autocvar_g_balance_electro_primary_ammo; if(autocvar_g_balance_electro_lightning) - ammo_amount += !autocvar_g_balance_electro_primary_ammo || (self.electro_load > 0); - else ammo_amount += self.electro_load >= autocvar_g_balance_electro_primary_ammo; } + return ammo_amount; } else if (req == WR_CHECKAMMO2) -- 2.39.2