Fix impossibility to reload current weapon if you have unlimited ammo and current...

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index 2e5a8434d74a91848f20eb9891a3ba735948dfc6..f9543785ba484588bb4e6d235cd1067d8537360d 100644 (file)
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -1640,15 +1640,14 @@ void W_ReloadedAndReady()
        self.clip_load = self.old_clip_load; // restore the ammo counter, in case we still had ammo in the weapon before reloading
 
        // if the gun uses no ammo, max out weapon load, else decrease ammo as we increase weapon load
-       if(!self.reload_ammo_min)
+       if(!self.reload_ammo_min || self.items & IT_UNLIMITED_WEAPON_AMMO)
                self.clip_load = self.reload_ammo_amount;
        else
        {
                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;
-                       if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-                               self.(self.current_ammo) -= 1;
+                       self.(self.current_ammo) -= 1;
                }
        }
        self.weapon_load[self.weapon] = self.clip_load;
@@ -1693,6 +1692,7 @@ void W_Reload(float sent_ammo_min, float sent_ammo_amount, float sent_time, stri
 
        // no ammo, so nothing to load
        if(!self.(self.current_ammo) && self.reload_ammo_min)
+       if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
        {
                if(clienttype(self) == CLIENTTYPE_REAL && self.reload_complain < time)
                {