From e29766a202f33b81241933a2f5b41a287256e397 Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 24 Oct 2008 06:21:24 +0000 Subject: [PATCH] fix IT_UNLIMITED_AMMO git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4850 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_weaponsystem.qc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc index d41a8f107..01bed1127 100644 --- a/data/qcsrc/server/cl_weaponsystem.qc +++ b/data/qcsrc/server/cl_weaponsystem.qc @@ -389,11 +389,18 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain) { if (andammo) { - oldself = self; - self = cl; - f = weapon_action(wpn, WR_CHECKAMMO1); - f = f + weapon_action(wpn, WR_CHECKAMMO2); - self = oldself; + if(cl.items & IT_UNLIMITED_AMMO) + { + f = 1; + } + else + { + oldself = self; + self = cl; + f = weapon_action(wpn, WR_CHECKAMMO1); + f = f + weapon_action(wpn, WR_CHECKAMMO2); + self = oldself; + } if (!f) { if (complain) @@ -459,6 +466,7 @@ float weapon_prepareattack(float secondary, float attacktime) return FALSE; } + if not(self.items & IT_UNLIMITED_AMMO) if (!weapon_action(self.weapon, WR_CHECKAMMO1 + secondary)) { W_SwitchWeapon_Force(self, w_getbestweapon(self)); -- 2.39.2