From: terencehill <piuntn@gmail.com>
Date: Tue, 5 Feb 2013 09:51:52 +0000 (+0100)
Subject: Fix condition to stop drawing weapons panel when it completely disappears
X-Git-Tag: xonotic-v0.7.0~98^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e9293533c092d6dc7d15f39b8dd35ebaf4d1c9b9;p=xonotic%2Fxonotic-data.pk3dir.git

Fix condition to stop drawing weapons panel when it completely disappears
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index a5fe9372f..abc43ce3a 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -468,7 +468,8 @@ void HUD_Weapons(void)
 	{
 		if((!autocvar_hud_panel_weapons) || (spectatee_status == -1))
 			return;
-		else if(timeout && time >= weapontime + timeout + timeout_effect_length && ((autocvar_hud_panel_weapons_timeout_effect != 1) && !(autocvar_hud_panel_weapons_timeout_fadebgmin + autocvar_hud_panel_weapons_timeout_fadefgmin)))
+		if(timeout && time >= weapontime + timeout + timeout_effect_length)
+		if(autocvar_hud_panel_weapons_timeout_effect == 3 || (autocvar_hud_panel_weapons_timeout_effect == 1 && !(autocvar_hud_panel_weapons_timeout_fadebgmin + autocvar_hud_panel_weapons_timeout_fadefgmin)))
 		{
 			weaponprevtime = time;
 			return;