From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 24 Aug 2011 09:42:53 +0000 (+0200)
Subject: crylink: only block the SAME fire button while waiting for release
X-Git-Tag: xonotic-v0.5.0~71
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=748cbbf868bc7e56cdfac962a3d5f2ddf101332d;p=xonotic%2Fxonotic-data.pk3dir.git

crylink: only block the SAME fire button while waiting for release
---

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index 6490a3e3a..d58f6e0dd 100644
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -534,7 +534,7 @@ float w_crylink(float req)
 			weapon_action(self.weapon, WR_RELOAD);
 		else if (self.BUTTON_ATCK)
 		{
-			if (!self.crylink_waitrelease)
+			if (self.crylink_waitrelease != 1)
 			if (weapon_prepareattack(0, autocvar_g_balance_crylink_primary_refire))
 			{
 				W_Crylink_Attack();
@@ -545,7 +545,7 @@ float w_crylink(float req)
 		}
 		else if(self.BUTTON_ATCK2 && autocvar_g_balance_crylink_secondary)
 		{
-			if (!self.crylink_waitrelease)
+			if (self.crylink_waitrelease != 2)
 			if (weapon_prepareattack(1, autocvar_g_balance_crylink_secondary_refire))
 			{
 				W_Crylink_Attack2();
@@ -554,9 +554,10 @@ float w_crylink(float req)
 					self.crylink_waitrelease = 2;
 			}
 		}
-		else
+
+		if ((self.crylink_waitrelease == 1 && !self.BUTTON_ATCK) || (self.crylink_waitrelease == 2 && !self.BUTTON_ATCK2))
 		{
-			if (self.crylink_waitrelease && (!self.crylink_lastgroup || time > self.crylink_lastgroup.teleport_time))
+			if (!self.crylink_lastgroup || time > self.crylink_lastgroup.teleport_time)
 			{
 				// fired and released now!
 				if(self.crylink_lastgroup)