From 8719b003974ee735797b4b80b6cbf2e41d99ae3b Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sat, 16 Jul 2011 17:51:46 +0300 Subject: [PATCH] Don't skip some important checks for the grabber while eaten --- data/qcsrc/server/w_grabber.qc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc index a41c01fd..0eedd518 100644 --- a/data/qcsrc/server/w_grabber.qc +++ b/data/qcsrc/server/w_grabber.qc @@ -69,10 +69,7 @@ void spawnfunc_weapon_grabber (void) float w_grabber(float req) { if(self.stat_eaten) // we can't use weapons while in the stomach - { self.grabber_state |= GRABBER_REMOVING; - return FALSE; - } float ammo_amount; float grabbered_time_max, grabbered_fuel; @@ -95,6 +92,8 @@ float w_grabber(float req) { if (self.BUTTON_ATCK && weapon_action(self.weapon, WR_CHECKAMMO1)) { + if(self.stat_eaten) // we can't use weapons while in the stomach + return FALSE; if(time < self.weapon_delay) return FALSE; @@ -113,6 +112,9 @@ float w_grabber(float req) } if (self.BUTTON_ATCK2 && weapon_action(self.weapon, WR_CHECKAMMO2)) { + + if(self.stat_eaten) // we can't use weapons while in the stomach + return FALSE; if (weapon_prepareattack(1, cvar("g_balance_grabber_secondary_refire"))) { W_Grabber_Attack2(); -- 2.39.2