From: Samual Lenks <samual@xonotic.org>
Date: Sun, 5 Jan 2014 21:54:22 +0000 (-0500)
Subject: Don't decrease ammo_none field
X-Git-Tag: xonotic-v0.8.0~152^2~122
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f96f123dec0979de55e2042d4e0ad218d06bc5c9;p=xonotic%2Fxonotic-data.pk3dir.git

Don't decrease ammo_none field
---

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 70b916ced..7c8ce3511 100644
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -812,7 +812,7 @@ void W_DecreaseAmmo(float ammo_use)
 		self.clip_load -= ammo_use;
 		self.(weapon_load[self.weapon]) = self.clip_load;
 	}
-	else
+	else if(wep.ammo_field != ammo_none)
 	{
 		self.(wep.ammo_field) -= ammo_use;
 		if(self.(wep.ammo_field) < 0)