From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 16 Jul 2011 14:51:46 +0000 (+0300)
Subject: Don't skip some important checks for the grabber while eaten
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8719b003974ee735797b4b80b6cbf2e41d99ae3b;p=voretournament%2Fvoretournament.git

Don't skip some important checks for the grabber while eaten
---

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();