From: MirceaKitsune Date: Wed, 1 Feb 2012 14:49:23 +0000 (+0200) Subject: Fix an issue with forced reload on the grabber X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=24fd1e28062311fe97d9ef7e6c562047b180ba9e;p=voretournament%2Fvoretournament.git Fix an issue with forced reload on the grabber --- diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc index be01df85..89d20137 100644 --- a/data/qcsrc/server/w_grabber.qc +++ b/data/qcsrc/server/w_grabber.qc @@ -98,7 +98,7 @@ float w_grabber(float req) grabbered_fuel = cvar("g_balance_grabber_primary_grabbered_fuel"); // forced reload if(cvar("g_balance_grabber_reload_ammo") && self.clip_load < min(cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_secondary_ammo")) - && !(self.clip_load >= (time - self.grabber_time_fueldecrease) * grabbered_fuel && self.grabber)) // not while hooked and still have ammo to stay hooked + && !(self.clip_load >= (time - self.grabber_time_fueldecrease) * grabbered_fuel && (self.grabber || self.grabber_state & GRABBER_FIRING))) // not while hooked and still have ammo to stay hooked { 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);