X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fw_grabber.qc;h=ba0afe738c4a50d53d1d4ad084653898f2255e2e;hp=f2cd82964c952e771c8e7bc467b8899a099c0ffb;hb=e03eccb2fb3597361ddeec65ae447587d6e95bac;hpb=63a785ce32f31ab72c814565cde1523cab0232cd

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index f2cd8296..ba0afe73 100644
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -62,7 +62,7 @@ void spawnfunc_weapon_grabber (void)
 
 float w_grabber(float req)
 {
-	if(self.predator.classname == "player") // we can't use weapons while in the stomach
+	if(self.stat_eaten) // we can't use weapons while in the stomach
 	{
 		self.grabber_state |= GRABBER_REMOVING;
 		return FALSE;
@@ -85,9 +85,9 @@ float w_grabber(float req)
 			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);
 		}
-		else if not(self.clip_load < 0) // we're currently reloading
+		else if not(self.clip_load < 0) // we're not currently reloading
 		{
-			if (self.BUTTON_ATCK)
+			if (self.BUTTON_ATCK && weapon_action(self.weapon, WR_CHECKAMMO1))
 			{
 				if(time < self.weapon_delay)
 					return FALSE;
@@ -105,7 +105,7 @@ float w_grabber(float req)
 					weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grabber_primary_animtime"), w_ready);				
 				}
 			}
-			if (self.BUTTON_ATCK2)
+			if (self.BUTTON_ATCK2 && weapon_action(self.weapon, WR_CHECKAMMO2))
 			{
 				if (weapon_prepareattack(1, cvar("g_balance_grabber_secondary_refire")))
 				{