From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 11 Apr 2011 12:59:29 +0000 (+0300)
Subject: Don't allow primary fire to shoot while loading.
X-Git-Tag: xonotic-v0.5.0~263^2~10^2~78
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c327e1d274671fcdaa8789040cf82374dcb40da3;p=xonotic%2Fxonotic-data.pk3dir.git

Don't allow primary fire to shoot while loading.
---

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index c0ecc63d0..fd4846b29 100644
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -237,7 +237,7 @@ float w_hagar(float req)
 	{
 		if(autocvar_g_balance_hagar_reload_ammo && self.clip_load < min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo)) // forced reload
 			weapon_action(self.weapon, WR_RELOAD);
-		else if (self.BUTTON_ATCK)
+		else if (self.BUTTON_ATCK && !self.hagar_load) // not while loading secondary fire
 		{
 			if (weapon_prepareattack(0, autocvar_g_balance_hagar_primary_refire))
 			{
@@ -246,7 +246,7 @@ float w_hagar(float req)
 			}
 		}
 		else if(autocvar_g_balance_hagar_secondary_load)
-			W_Hagar_Attack2_Load();
+			W_Hagar_Attack2_Load(); // must run each frame
 		else if (self.BUTTON_ATCK2 && autocvar_g_balance_hagar_secondary)
 		{
 			if (weapon_prepareattack(1, autocvar_g_balance_hagar_secondary_refire))