From: terencehill <piuntn@gmail.com>
Date: Sun, 5 Aug 2018 18:25:00 +0000 (+0200)
Subject: Fix #2066 "Hagar secondary works in CA before round starts"
X-Git-Tag: xonotic-v0.8.5~1934
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4e9982303475e2dc97a6315857919f66a0c9d177;p=xonotic%2Fxonotic-data.pk3dir.git

Fix #2066 "Hagar secondary works in CA before round starts"
---

diff --git a/qcsrc/common/weapons/weapon/hagar.qc b/qcsrc/common/weapons/weapon/hagar.qc
index 03855e316..861def9c7 100644
--- a/qcsrc/common/weapons/weapon/hagar.qc
+++ b/qcsrc/common/weapons/weapon/hagar.qc
@@ -257,6 +257,8 @@ void W_Hagar_Attack2_Load(Weapon thiswep, entity actor, .entity weaponentity)
 	// loadable hagar secondary attack, must always run each frame
 	if(time < game_starttime || time < actor.race_penalty || timeout_status == TIMEOUT_ACTIVE)
 		return;
+	if (round_handler_IsActive() && !round_handler_IsRoundStarted())
+		return;
 
 	bool loaded = actor.(weaponentity).hagar_load >= WEP_CVAR_SEC(hagar, load_max);