From: Mario <mario.mario@y7mail.com>
Date: Wed, 5 Jun 2013 20:14:56 +0000 (+1000)
Subject: Fix mage constantly trying to increase ammo if the player has max ammo
X-Git-Tag: xonotic-v0.8.0~241^2^2~194
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=79ea994584e1ed3ec146f1f0e9b49919bc4a0f01;p=xonotic%2Fxonotic-data.pk3dir.git

Fix mage constantly trying to increase ammo if the player has max ammo
---

diff --git a/qcsrc/server/monsters/monster/mage.qc b/qcsrc/server/monsters/monster/mage.qc
index 740052ff6..e107866ce 100644
--- a/qcsrc/server/monsters/monster/mage.qc
+++ b/qcsrc/server/monsters/monster/mage.qc
@@ -63,7 +63,7 @@ float friend_needshelp(entity e)
 		}
 		case 1:
 		{
-			if(e.ammo_cells < g_pickup_cells_max || e.ammo_rockets < g_pickup_rockets_max || e.ammo_nails < g_pickup_nails_max || e.ammo_shells < g_pickup_shells_max)
+			if((e.ammo_cells && e.ammo_cells < g_pickup_cells_max) || (e.ammo_rockets && e.ammo_rockets < g_pickup_rockets_max) || (e.ammo_nails && e.ammo_nails < g_pickup_nails_max) || (e.ammo_shells && e.ammo_shells < g_pickup_shells_max))
 				return TRUE;
 			break;
 		}