]> git.rm.cloudns.org Git - voretournament/voretournament.git/commitdiff
Fix an issue with forced reload on the grabber
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 1 Feb 2012 14:49:23 +0000 (16:49 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 1 Feb 2012 14:49:23 +0000 (16:49 +0200)
data/qcsrc/server/w_grabber.qc

index be01df85f85cf7c5e7e47e1fcdb398669e17f02e..89d2013781a14cd28f95bfe75ead637bc04a52ef 100644 (file)
@@ -98,7 +98,7 @@ float w_grabber(float req)
                grabbered_fuel = cvar("g_balance_grabber_primary_grabbered_fuel");\r
                // forced reload\r
                if(cvar("g_balance_grabber_reload_ammo") && self.clip_load < min(cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_secondary_ammo"))\r
-               && !(self.clip_load >= (time - self.grabber_time_fueldecrease) * grabbered_fuel && self.grabber)) // not while hooked and still have ammo to stay hooked\r
+               && !(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\r
                {\r
                        if(self.ammo_fuel >= 1) // we only have one weapon in VT, so nothing else to switch to if we're out of ammo\r
                                weapon_action(self.weapon, WR_RELOAD);\r