From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 24 Aug 2011 09:55:16 +0000 (+0200)
Subject: more crylink cleanup
X-Git-Tag: xonotic-v0.5.0~68^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f5012c91f6ddb49e6ef85f73d5c931d78a6d9b34;p=xonotic%2Fxonotic-data.pk3dir.git

more crylink cleanup
---

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index 05f381f3b..c091a872b 100644
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -422,8 +422,12 @@ void W_Crylink_Attack (void)
 
 		counter = counter + 1;
 	}
-	self.crylink_lastgroup = proj;
-	W_Crylink_CheckLinks(proj);
+	if(autocvar_g_balance_crylink_primary_joinspread != 0 || autocvar_g_balance_crylink_primary_jointime != 0)
+	{
+		self.crylink_lastgroup = proj;
+		W_Crylink_CheckLinks(proj);
+		self.crylink_waitrelease = 1;
+	}
 }
 
 void W_Crylink_Attack2 (void)
@@ -510,7 +514,12 @@ void W_Crylink_Attack2 (void)
 
 		counter = counter + 1;
 	}
-	self.crylink_lastgroup = proj;
+	if(autocvar_g_balance_crylink_secondary_joinspread != 0 || autocvar_g_balance_crylink_secondary_jointime != 0)
+	{
+		self.crylink_lastgroup = proj;
+		W_Crylink_CheckLinks(proj);
+		self.crylink_waitrelease = 2;
+	}
 }
 
 void spawnfunc_weapon_crylink (void)
@@ -540,8 +549,6 @@ float w_crylink(float req)
 			{
 				W_Crylink_Attack();
 				weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_crylink_primary_animtime, w_ready);
-				if(autocvar_g_balance_crylink_primary_joinspread != 0 || autocvar_g_balance_crylink_primary_jointime != 0)
-					self.crylink_waitrelease = 1;
 			}
 		}
 
@@ -552,8 +559,6 @@ float w_crylink(float req)
 			{
 				W_Crylink_Attack2();
 				weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_crylink_secondary_animtime, w_ready);
-				if(autocvar_g_balance_crylink_secondary_joinspread != 0 || autocvar_g_balance_crylink_secondary_jointime != 0)
-					self.crylink_waitrelease = 2;
 			}
 		}