From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 12 Jan 2012 17:23:39 +0000 (+0100)
Subject: if throwing away superweapon, it's over
X-Git-Tag: xonotic-v0.6.0~177^2^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e3ec9492f440ea357b5e63668d6b5158ae8a642d;p=xonotic%2Fxonotic-data.pk3dir.git

if throwing away superweapon, it's over
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 40b82224b..ebf4abc4b 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1895,17 +1895,26 @@ void player_powerups (void)
 		}
 		if (self.items & IT_SUPERWEAPON)
 		{
-			play_countdown(self.superweapons_finished, "misc/poweroff.wav");
 			self.effects = self.effects | EF_RED;
-			if (self.items & IT_UNLIMITED_SUPERWEAPONS)
+			if (!(self.weapons & WEPBIT_SUPERWEAPONS))
+			{
+				self.superweapons_finished = 0;
+				self.items = self.items - (self.items & IT_SUPERWEAPON);
+				sprint(self, "^3Superweapons have been lost\n");
+			}
+			else if (self.items & IT_UNLIMITED_SUPERWEAPONS)
 			{
 				// don't let them run out
 			}
-			else if (time > self.superweapons_finished)
+			else
 			{
-				self.items = self.items - (self.items & IT_SUPERWEAPON);
-				self.weapons &~= WEPBIT_SUPERWEAPONS;
-				sprint(self, "^3Superweapons have broken down\n");
+				play_countdown(self.superweapons_finished, "misc/poweroff.wav");
+				if (time > self.superweapons_finished)
+				{
+					self.items = self.items - (self.items & IT_SUPERWEAPON);
+					self.weapons &~= WEPBIT_SUPERWEAPONS;
+					sprint(self, "^3Superweapons have broken down\n");
+				}
 			}
 		}
 		else