From: terencehill <piuntn@gmail.com>
Date: Sun, 25 Sep 2016 16:14:18 +0000 (+0200)
Subject: Allow using blaster secondary during round start delay in Overkill as long as it... 
X-Git-Tag: xonotic-v0.8.2~553^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=05620b234d2481a49e0441457dd64c4b4a8ca9d8;p=xonotic%2Fxonotic-data.pk3dir.git

Allow using blaster secondary during round start delay in Overkill as long as it doesn't deal any damage
---

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index c29814eb1..0dcdc5b76 100644
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -197,7 +197,8 @@ MUTATOR_HOOKFUNCTION(ok, PlayerPreThink)
 	ok_IncreaseCharge(player, PS(player).m_weapon.m_id);
 
 	if(PHYS_INPUT_BUTTON_ATCK2(player))
-	if(!forbidWeaponUse(player) || player.weapon_blocked) // allow if weapon is blocked
+	if( !forbidWeaponUse(player) || player.weapon_blocked // allow if weapon is blocked
+		|| (round_handler_IsActive() && !round_handler_IsRoundStarted()) )
 	if(time >= player.jump_interval)
 	{
 		player.jump_interval = time + WEP_CVAR_PRI(blaster, refire) * W_WeaponRateFactor(player);