From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 28 Feb 2011 16:07:15 +0000 (+0200)
Subject: Don't allow one grabber firing button to block the other off
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=1764a49984c755fad6fd6e6b5b28e0204580ac9a

Don't allow one grabber firing button to block the other off
---

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 844915a0..4e39d096 100644
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -82,28 +82,31 @@ 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 (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))
+		else
 		{
-			if(time < self.weapon_delay)
-				return FALSE;
-
-			if(!self.grabber)
-			if not(self.grabber_state & GRABBER_WAITING_FOR_RELEASE)
-			if not(self.grabber_state & GRABBER_FIRING)
-			if (time > self.grabber_refire)
-			if (weapon_prepareattack(0, -1))
+			if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))
 			{
-				W_DecreaseAmmo(ammo_fuel, cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_reload_ammo"));
-				self.grabber_state |= GRABBER_FIRING;
-				weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grabber_primary_animtime"), w_ready);				
+				if(time < self.weapon_delay)
+					return FALSE;
+
+				if(!self.grabber)
+				if not(self.grabber_state & GRABBER_WAITING_FOR_RELEASE)
+				if not(self.grabber_state & GRABBER_FIRING)
+				if (time > self.grabber_refire)
+				if (weapon_prepareattack(0, -1))
+				{
+					W_DecreaseAmmo(ammo_fuel, cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_reload_ammo"));
+					self.grabber_state |= GRABBER_FIRING;
+					weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grabber_primary_animtime"), w_ready);				
+				}
 			}
-		}
-		else if (self.BUTTON_ATCK2)
-		{
-			if (weapon_prepareattack(1, cvar("g_balance_grabber_secondary_refire")))
+			if (self.BUTTON_ATCK2)
 			{
-				W_Grabber_Attack2();
-				weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_grabber_secondary_animtime"), w_ready);
+				if (weapon_prepareattack(1, cvar("g_balance_grabber_secondary_refire")))
+				{
+					W_Grabber_Attack2();
+					weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_grabber_secondary_animtime"), w_ready);
+				}
 			}
 		}