From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 12 Jul 2011 14:42:34 +0000 (+0300)
Subject: Grabber: Don't behave differently while the player is crouching. Fixes a bug
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=25ec1c4fdd064c2e0cfaffce3541336b794672ac;p=voretournament%2Fvoretournament.git

Grabber: Don't behave differently while the player is crouching. Fixes a bug
---

diff --git a/data/qcsrc/server/g_grabber.qc b/data/qcsrc/server/g_grabber.qc
index 264ce29e..a92cedab 100644
--- a/data/qcsrc/server/g_grabber.qc
+++ b/data/qcsrc/server/g_grabber.qc
@@ -356,16 +356,7 @@ void GrabberFrame()
 		self.grabber_state &~= GRABBER_WAITING_FOR_RELEASE;
 
 		self.grabber_state &~= GRABBER_RELEASING;
-		if(self.BUTTON_CROUCH)
-		{
-			self.grabber_state &~= GRABBER_PULLING;
-			//self.grabber_state |= GRABBER_RELEASING;
-		}
-		else
-		{
-			self.grabber_state |= GRABBER_PULLING;
-			//self.grabber_state &~= GRABBER_RELEASING;
-		}
+		self.grabber_state |= GRABBER_PULLING;
 	}
 
 	if(self.weapon != WEP_GRABBER)
diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 50b6addb..52598904 100644
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -174,30 +174,19 @@ float w_grabber(float req)
 			self.grabber_time_fueldecrease = time + cvar("g_balance_grabber_primary_grabbered_time_free");
 		}
 
-		if (self.BUTTON_CROUCH)
+		self.grabber_state |= GRABBER_PULLING;
+		self.grabber_state &~= GRABBER_RELEASING;
+
+		if (self.BUTTON_ATCK)
 		{
-			self.grabber_state &~= GRABBER_PULLING;
-			if (self.BUTTON_ATCK)
-				self.grabber_state &~= GRABBER_RELEASING;
-			else
-				self.grabber_state |= GRABBER_RELEASING;
+			// already fired
+			if(self.grabber)
+				self.grabber_state |= GRABBER_WAITING_FOR_RELEASE;
 		}
 		else
 		{
-			self.grabber_state |= GRABBER_PULLING;
-			self.grabber_state &~= GRABBER_RELEASING;
-
-			if (self.BUTTON_ATCK)
-			{
-				// already fired
-				if(self.grabber)
-					self.grabber_state |= GRABBER_WAITING_FOR_RELEASE;
-			}
-			else
-			{
-				self.grabber_state |= GRABBER_REMOVING;
-				self.grabber_state &~= GRABBER_WAITING_FOR_RELEASE;
-			}
+			self.grabber_state |= GRABBER_REMOVING;
+			self.grabber_state &~= GRABBER_WAITING_FOR_RELEASE;
 		}
 	}
 	else if (req == WR_PRECACHE)