X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fw_grabber.qc;h=5259890474aba012f7ad08a527cd0711ba05de62;hp=50b6addb6fe8ddb1a97b2ab1eeabfd58812cea9e;hb=25ec1c4fdd064c2e0cfaffce3541336b794672ac;hpb=139e0015ca218ec3e58497c3606394d88ff30202

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)