From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 20 Apr 2011 15:09:19 +0000 (+0300)
Subject: Check both ammos before attempting to switch guns
X-Git-Tag: xonotic-v0.5.0~263^2~10^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9bf9a65f2cf25525f8544df2980d1146d713217d;p=xonotic%2Fxonotic-data.pk3dir.git

Check both ammos before attempting to switch guns
---

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index d7692561a..aaefb0064 100644
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -247,7 +247,7 @@ void W_Hagar_Attack2_Load (void)
 		self.weapon_forbidchange = FALSE;
 
 	// we aren't checking ammo during an attack, so we must do it here
-	if not(weapon_action(self.weapon, WR_CHECKAMMO2))
+	if not(weapon_action(self.weapon, WR_CHECKAMMO1) + weapon_action(self.weapon, WR_CHECKAMMO2))
 	{
 		W_SwitchToOtherWeapon(self);
 		return;