From 2ae83d957bf3d48e5384bf52b14dde59c8e74edb Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 26 Mar 2009 17:04:03 +0000 Subject: [PATCH] hook: unlimited ammo PROPER handling git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6311 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/w_hook.qc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/data/qcsrc/server/w_hook.qc b/data/qcsrc/server/w_hook.qc index ea351277f..0f5af5b11 100644 --- a/data/qcsrc/server/w_hook.qc +++ b/data/qcsrc/server/w_hook.qc @@ -154,16 +154,18 @@ float w_hook(float req) { if ( time > self.hook_time_ammodecrease ) { - if ( self.ammo_cells >= 1 ) + if not(self.items & IT_UNLIMITED_WEAPON_AMMO) { - if not(self.items & IT_UNLIMITED_WEAPON_AMMO) + if ( self.ammo_cells >= frametime / hooked_ammodecrease_delay ) + { self.ammo_cells -= frametime / hooked_ammodecrease_delay; - // decrease next frame again - } - else - { - self.hook_state |= HOOK_REMOVING; - W_SwitchWeapon_Force(self, w_getbestweapon(self)); + // decrease next frame again + } + else + { + self.hook_state |= HOOK_REMOVING; + W_SwitchWeapon_Force(self, w_getbestweapon(self)); + } } } } -- 2.39.2