From: Mario <mario@smbclan.net>
Date: Fri, 4 Nov 2016 13:54:47 +0000 (+1000)
Subject: Fix hagar loading and switching weapons
X-Git-Tag: xonotic-v0.8.2~465
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7ae1ea866c64656f219b530cb14e1eaf36b7f13e;p=xonotic%2Fxonotic-data.pk3dir.git

Fix hagar loading and switching weapons
---

diff --git a/qcsrc/common/weapons/weapon/hagar.qc b/qcsrc/common/weapons/weapon/hagar.qc
index d533f1909..684ee75d3 100644
--- a/qcsrc/common/weapons/weapon/hagar.qc
+++ b/qcsrc/common/weapons/weapon/hagar.qc
@@ -313,7 +313,7 @@ void W_Hagar_Attack2_Load(Weapon thiswep, entity actor, .entity weaponentity)
 {
 	// loadable hagar secondary attack, must always run each frame
 
-	if(time < game_starttime || PS(actor).m_switchweapon != WEP_HAGAR)
+	if(time < game_starttime)
 		return;
 
 	bool loaded = actor.hagar_load >= WEP_CVAR_SEC(hagar, load_max);