From 0bb8d5706f4da165c323abeffedefa7971e18148 Mon Sep 17 00:00:00 2001 From: TimePath Date: Thu, 25 Dec 2014 21:23:51 +1100 Subject: [PATCH] Fix #1434 --- qcsrc/server/weapons/weaponsystem.qc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index 762f9a0e3..2d8fa6b00 100644 --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@ -691,7 +691,7 @@ void W_WeaponFrame() self.weapon = self.switchweapon; self.weaponname = newwep.mdl; self.bulletcounter = 0; - //self.ammo_field = newwep.ammo_field; + self.ammo_field = newwep.ammo_field; WEP_ACTION(self.switchweapon, WR_SETUP); self.weaponentity.state = WS_RAISE; @@ -864,11 +864,10 @@ void W_ReloadedAndReady() self.clip_load = self.reload_ammo_amount; else { - while(self.clip_load < self.reload_ammo_amount && self.(self.ammo_field)) // make sure we don't add more ammo than we have - { - self.clip_load += 1; - self.(self.ammo_field) -= 1; - } + // make sure we don't add more ammo than we have + float load = min(self.reload_ammo_amount - self.clip_load, self.(self.ammo_field)); + self.clip_load += load; + self.(self.ammo_field) -= load; } self.(weapon_load[self.weapon]) = self.clip_load; -- 2.39.2