From: terencehill <piuntn@gmail.com>
Date: Sun, 20 Mar 2011 18:58:33 +0000 (+0100)
Subject: Fix impossibility to reload current weapon if you have unlimited ammo and current... 
X-Git-Tag: xonotic-v0.5.0~305^2~28^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9fbfc96516b1abc4591f21f2ac6696866b2aa635;p=xonotic%2Fxonotic-data.pk3dir.git

Fix impossibility to reload current weapon if you have unlimited ammo and current weapon ammo is 0
---

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index 2e5a8434d..f9543785b 100644
--- 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)
 		{