From cc362a7725ad4b9ae9ab2b452e6609f1ec2b4a62 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Mon, 28 Feb 2011 17:34:46 +0200 Subject: [PATCH 1/1] Don't endlessly attempt to force reload the grabber if we're out of ammo, since we have no other weapon to switch to --- data/qcsrc/server/w_grabber.qc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc index 1d2266bb..40786f57 100644 --- a/data/qcsrc/server/w_grabber.qc +++ b/data/qcsrc/server/w_grabber.qc @@ -75,7 +75,10 @@ float w_grabber(float req) else if (req == WR_THINK) { if(cvar("g_balance_grabber_reload_ammo") && self.clip_load < min(cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_secondary_ammo"))) // forced reload - weapon_action(self.weapon, WR_RELOAD); + { + if(self.ammo_fuel >= 1) // we only have one weapon in VT, so nothing else to switch to if we're out of ammo + weapon_action(self.weapon, WR_RELOAD); + } else if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK)) { if(time < self.weapon_delay) -- 2.39.2