From c316ed80a08aac5eb2f4b558c4460e28fee5cec7 Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 15 Oct 2009 07:22:31 +0000 Subject: [PATCH] and make it work :P git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8137 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_weaponsystem.qc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc index 5f5c91a05..bc62e566a 100644 --- a/data/qcsrc/server/cl_weaponsystem.qc +++ b/data/qcsrc/server/cl_weaponsystem.qc @@ -968,13 +968,13 @@ float weapon_prepareattack(float secondary, float attacktime) if (!weapon_action(self.weapon, WR_CHECKAMMO1 + secondary)) { // hack to ensure it switches to an OTHER weapon (in case the other fire mode still has ammo, we want that anyway) - float w; + float w, ww; w = W_WeaponBit(self.weapon); self.weapons &~= w; - if(w_getbestweapon(self) == 0) - self.weapons |= w; // if we have nothing ELSE, stay - W_SwitchWeapon_Force(self, w_getbestweapon(self)); + ww = w_getbestweapon(self); self.weapons |= w; + if(ww) + W_SwitchWeapon_Force(self, ww); return FALSE; } -- 2.39.2