X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_crylink.qc;h=ce68dbeba1644e38ea465ce9f6b01188b0f1a30e;hp=de5abb1fda2630afc7103b57d9ddda2fb083b87a;hb=bb75b98315e73b476d074f86fdee46888d8d56d3;hpb=14fcdf9c0f77aa57d45cef6efaa16ff012ab62b2

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index de5abb1fda..ce68dbeba1 100644
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -482,8 +482,14 @@ float w_crylink(float req)
 					linkjoineffect.owner = self;
 					setorigin(linkjoineffect, pos);
 				}
+				self.crylink_waitrelease = 0;
+				if(!w_crylink(WR_CHECKAMMO1) && !w_crylink(WR_CHECKAMMO2))
+				{
+					// ran out of ammo!
+					self.cnt = WEP_CRYLINK;
+					self.switchweapon = w_getbestweapon(self);
+				}
 			}
-			self.crylink_waitrelease = 0;
 		}
 	}
 	else if (req == WR_PRECACHE)
@@ -498,9 +504,19 @@ float w_crylink(float req)
 	else if (req == WR_SETUP)
 		weapon_setup(WEP_CRYLINK);
 	else if (req == WR_CHECKAMMO1)
+	{
+		// don't "run out of ammo" and switch weapons while waiting for release
+		if(self.crylink_lastgroup && self.crylink_waitrelease)
+			return TRUE;
 		return self.ammo_cells >= cvar("g_balance_crylink_primary_ammo");
+	}
 	else if (req == WR_CHECKAMMO2)
+	{
+		// don't "run out of ammo" and switch weapons while waiting for release
+		if(self.crylink_lastgroup && self.crylink_waitrelease)
+			return TRUE;
 		return self.ammo_cells >= cvar("g_balance_crylink_secondary_ammo");
+	}
 	return TRUE;
 };
 #endif