From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 16 Jan 2012 12:00:12 +0000 (+0100)
Subject: fixes
X-Git-Tag: xonotic-v0.6.0~157^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2529818452071c71aaec0a7381745f0fb0d868ba;p=xonotic%2Fxonotic-data.pk3dir.git

fixes
---

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 73d610b6c..4a12ce185 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -205,27 +205,27 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 
 	if(W_WeaponBit(wpn) & WEPBIT_SUPERWEAPONS)
 	{
-		if(self.items & IT_UNLIMITED_SUPERWEAPONS)
+		if(own.items & IT_UNLIMITED_SUPERWEAPONS)
 		{
 			wep.superweapons_finished = time + autocvar_g_balance_superweapons_time;
 		}
 		else
 		{
-			float superweapons = 0;
+			float superweapons = 1;
 			for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-				if(self.weapons & WEPBIT_SUPERWEAPONS & W_WeaponBit(i))
+				if(own.weapons & WEPBIT_SUPERWEAPONS & W_WeaponBit(i))
 					++superweapons;
 			if(superweapons <= 1)
 			{
-				wep.superweapons_finished = self.superweapons_finished;
-				self.superweapons_finished = 0;
+				wep.superweapons_finished = own.superweapons_finished;
+				own.superweapons_finished = 0;
 			}
 			else
 			{
-				float timeleft = self.superweapons_finished - time;
+				float timeleft = own.superweapons_finished - time;
 				float weptimeleft = timeleft / superweapons;
 				wep.superweapons_finished = time + weptimeleft;
-				self.superweapons_finished -= weptimeleft;
+				own.superweapons_finished -= weptimeleft;
 			}
 		}
 	}