From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 18 Sep 2011 11:17:24 +0000 (+0200)
Subject: fix a NIX issue
X-Git-Tag: xonotic-v0.6.0~40^2~133
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=979f3b4688685a32b22bc1efc9ecf2eeaeeca61e;p=xonotic%2Fxonotic-data.pk3dir.git

fix a NIX issue
---

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index afe3088d4..fe6789618 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -412,7 +412,8 @@ void W_WeaponFrame()
 		c = c + 1;
 		if(wb && ((self.weapons & wb) == 0))
 		{
-			W_SwitchWeapon_Force(self, w_getbestweapon(self));
+			if(self.weapon == self.switchweapon)
+				W_SwitchWeapon_Force(self, w_getbestweapon(self));
 			wb = 0;
 		}