From: terencehill <piuntn@gmail.com>
Date: Sun, 20 Mar 2011 22:32:23 +0000 (+0100)
Subject: Fix issues when shooting if you have unlimited ammo and current ammo is 0:
X-Git-Tag: xonotic-v0.5.0~305^2~28^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=06023f5e21ee0d7bebe29e2f575da146173d18c2;p=xonotic%2Fxonotic-data.pk3dir.git

Fix issues when shooting if you have unlimited ammo and current ammo is 0:
crylink and HLAC shoot once and then don't shoot anymore (or switch to a better weapon)
uzi doesn't shoot at all (or switches to a better weapon)
---

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index 5f5037cee..ef8dd8d16 100644
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -583,6 +583,7 @@ float w_crylink(float req)
 				}
 				self.crylink_waitrelease = 0;
 				if(!w_crylink(WR_CHECKAMMO1) && !w_crylink(WR_CHECKAMMO2))
+				if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 				{
 					// ran out of ammo!
 					self.cnt = WEP_CRYLINK;
diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index 8bb4c1de9..0cf25e4f6 100644
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -137,6 +137,7 @@ void HLAC_fire1_02()
 	if (self.BUTTON_ATCK)
 	{
 		if (!weapon_action(self.weapon, WR_CHECKAMMO1))
+		if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		{
 			W_SwitchWeapon_Force(self, w_getbestweapon(self));
 			w_ready();
diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc
index e45316800..2f5b9bc78 100644
--- a/qcsrc/server/w_uzi.qc
+++ b/qcsrc/server/w_uzi.qc
@@ -83,6 +83,7 @@ void uzi_fire1_02()
 	if (self.BUTTON_ATCK)
 	{
 		if (!weapon_action(self.weapon, WR_CHECKAMMO2))
+		if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		{
 			W_SwitchWeapon_Force(self, w_getbestweapon(self));
 			w_ready();
@@ -113,6 +114,7 @@ void uzi_mode1_fire_auto()
 	}
 
 	if (!weapon_action(self.weapon, WR_CHECKAMMO1))
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 	{
 		W_SwitchWeapon_Force(self, w_getbestweapon(self));
 		w_ready();