From: Mario <mario@smbclan.net>
Date: Mon, 25 Jun 2018 02:59:14 +0000 (+1000)
Subject: Check the specific cases instead of using weapon_prepareattack_check in hagar's load... 
X-Git-Tag: xonotic-v0.8.5~1987
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1451b6d77c5dccbcfb26ce0d8168dbe6727d0a50;p=xonotic%2Fxonotic-data.pk3dir.git

Check the specific cases instead of using weapon_prepareattack_check in hagar's load code (it has ammo checks of its own)
---

diff --git a/qcsrc/common/weapons/weapon/hagar.qc b/qcsrc/common/weapons/weapon/hagar.qc
index 7e76ffb1c..03855e316 100644
--- a/qcsrc/common/weapons/weapon/hagar.qc
+++ b/qcsrc/common/weapons/weapon/hagar.qc
@@ -255,7 +255,7 @@ void W_Hagar_Attack2_Load_Release(entity actor, .entity weaponentity)
 void W_Hagar_Attack2_Load(Weapon thiswep, entity actor, .entity weaponentity)
 {
 	// loadable hagar secondary attack, must always run each frame
-	if(!weapon_prepareattack_check(thiswep, actor, weaponentity, true, -1))
+	if(time < game_starttime || time < actor.race_penalty || timeout_status == TIMEOUT_ACTIVE)
 		return;
 
 	bool loaded = actor.(weaponentity).hagar_load >= WEP_CVAR_SEC(hagar, load_max);