From 9f518b445a9708f907a0a3c432de628abe61b927 Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 15 Oct 2009 07:20:21 +0000 Subject: [PATCH] force the out-of-ammo weapon switch even if the other mode still has ammo git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8135 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_weaponsystem.qc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc index 8c5b7c66a..e24b0ac55 100644 --- a/data/qcsrc/server/cl_weaponsystem.qc +++ b/data/qcsrc/server/cl_weaponsystem.qc @@ -967,7 +967,12 @@ float weapon_prepareattack(float secondary, float attacktime) if not(self.items & IT_UNLIMITED_WEAPON_AMMO) 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; + w = W_WeaponBit(self.weapon); + self.weapons &~= w; W_SwitchWeapon_Force(self, w_getbestweapon(self)); + self.weapons |= w; return FALSE; } -- 2.39.2