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.BUTTON_ATCK2)) // 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
weapon_setup(WEP_GRABBER);\r
self.grabber_state &~= GRABBER_WAITING_FOR_RELEASE;\r
self.current_ammo = ammo_fuel;\r
- W_Display(self, 2, 3);\r
}\r
else if (req == WR_CHECKAMMO1)\r
{\r
}\r
else if (req == WR_RELOAD)\r
{\r
- self.grabber_state |= GRABBER_REMOVING;\r
+ if(self.clip_load >= 0) // prevents a bug\r
+ self.grabber_state |= GRABBER_REMOVING;\r
W_Reload(min(cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_secondary_ammo")), cvar("g_balance_grabber_reload_ammo"), cvar("g_balance_grabber_reload_time"), "weapons/reload.wav");\r
}\r
else if (req == WR_SUICIDEMESSAGE)\r