From a802081a2b1ef61fc5e5355046397764ff3b2fe5 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Mon, 11 Jul 2011 15:46:31 +0300 Subject: [PATCH] Fix grabber checking the wrong ammo value while hooked, when being reloadable --- data/qcsrc/server/w_grabber.qc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc index ba0afe73..ca9025f4 100644 --- a/data/qcsrc/server/w_grabber.qc +++ b/data/qcsrc/server/w_grabber.qc @@ -141,7 +141,13 @@ float w_grabber(float req) { if not(self.items & IT_UNLIMITED_WEAPON_AMMO) { - if ( self.ammo_fuel >= (time - self.grabber_time_fueldecrease) * grabbered_fuel ) + float active_ammo; + if(cvar("g_balance_grabber_reload_ammo")) + active_ammo = self.clip_load; + else + active_ammo = self.ammo_fuel; + + if (active_ammo >= (time - self.grabber_time_fueldecrease) * grabbered_fuel ) { W_DecreaseAmmo(ammo_fuel, (time - self.grabber_time_fueldecrease) * grabbered_fuel, cvar("g_balance_grabber_reload_ammo")); self.grabber_time_fueldecrease = time; -- 2.39.2