From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 11 Nov 2010 21:56:07 +0000 (+0100)
Subject: also allow joinspeed==0 with jointime>0
X-Git-Tag: xonotic-v0.1.0preview~156
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=cbe4b5d591880e2df192dabe8043d7ff898520f1

also allow joinspeed==0 with jointime>0
---

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index 702cefc57f..5925827497 100644
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -453,7 +453,7 @@ float w_crylink(float req)
 			{
 				W_Crylink_Attack();
 				weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_crylink_primary_animtime"), w_ready);
-				if(cvar("g_balance_crylink_primary_joinspeed") != 0)
+				if(cvar("g_balance_crylink_primary_joinspeed") != 0 || cvar("g_balance_crylink_primary_jointime") != 0)
 					self.crylink_waitrelease = 1;
 			}
 		}
@@ -464,7 +464,7 @@ float w_crylink(float req)
 			{
 				W_Crylink_Attack2();
 				weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_crylink_secondary_animtime"), w_ready);
-				if(cvar("g_balance_crylink_secondary_joinspeed") != 0)
+				if(cvar("g_balance_crylink_secondary_joinspeed") != 0 || cvar("g_balance_crylink_secondary_jointime") != 0)
 					self.crylink_waitrelease = 2;
 			}
 		}