From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 21 May 2010 08:20:13 +0000 (+0200)
Subject: forbid weapon throwing of non-WS_READY weapons, fixes a bug
X-Git-Tag: xonotic-v0.1.0preview~589
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c2bf3482cea506685317fe27502bfa855c0fad87;p=xonotic%2Fxonotic-data.pk3dir.git

forbid weapon throwing of non-WS_READY weapons, fixes a bug
---

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index b5e245db6..04b656c9a 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -293,6 +293,8 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce)
 		return;
 	if(!W_IsWeaponThrowable(w))
 		return;
+	if(self.weaponentity.state != WS_READY)
+		return;
 
 	wb = W_WeaponBit(w);
 	if(self.weapons & wb != wb)
diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index b343862ba..15898759e 100644
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -34,7 +34,6 @@ float W_WeaponRateFactor()
 
 void W_SwitchWeapon_Force(entity e, float w)
 {
-	backtrace("switch");
 	e.cnt = e.switchweapon;
 	e.switchweapon = w;
 	e.selectweapon = w;