From c9a4e7c069bff271841fadecb490aa0b03bf22e0 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Tue, 15 Mar 2011 00:11:17 +0200 Subject: [PATCH] Fix reloading with weapon arenas / unlimited weapon ammo. Weapon load will now be decreased as you fire, but when you reload it will take no ammo. --- qcsrc/server/cl_weaponsystem.qc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index 3fab35fc9..74e2cd5fd 100644 --- a/qcsrc/server/cl_weaponsystem.qc +++ b/qcsrc/server/cl_weaponsystem.qc @@ -1614,7 +1614,7 @@ void W_SetupProjectileVelocity(entity missile, float pSpeed, float spread) void W_DecreaseAmmo(.float ammo_type, float ammo_use, float ammo_reload) { - if(self.items & IT_UNLIMITED_WEAPON_AMMO) + if(self.items & IT_UNLIMITED_WEAPON_AMMO && !ammo_reload) return; // if this weapon is reloadable, decrease its load. Else decrease the player's ammo @@ -1647,7 +1647,8 @@ void W_ReloadedAndReady() while(self.clip_load < self.reload_ammo_amount && self.(self.current_ammo)) // make sure we don't add more ammo than we have { self.clip_load += 1; - self.(self.current_ammo) -= 1; + if not(self.items & IT_UNLIMITED_WEAPON_AMMO) + self.(self.current_ammo) -= 1; } } self.weapon_load[self.weapon] = self.clip_load; -- 2.39.2