From: terencehill <piuntn@gmail.com>
Date: Thu, 19 Jan 2017 00:00:51 +0000 (+0100)
Subject: Fix/improve fade in/out of armor progressbar in the healtharmor panel
X-Git-Tag: xonotic-v0.8.2~283
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4f64bde20b7076a99f70be17793c5490b17899c3;p=xonotic%2Fxonotic-data.pk3dir.git

Fix/improve fade in/out of armor progressbar in the healtharmor panel
---

diff --git a/qcsrc/client/hud/panel/healtharmor.qc b/qcsrc/client/hud/panel/healtharmor.qc
index 4fad2c7c4..52d04bd93 100644
--- a/qcsrc/client/hud/panel/healtharmor.qc
+++ b/qcsrc/client/hud/panel/healtharmor.qc
@@ -210,12 +210,11 @@ void HUD_HealthArmor()
 				DrawNumIcon(pos + health_offset, mySize, health, "health", is_vertical, health_iconalign, HUD_Get_Num_Color(health, maxhealth), 1);
 		}
 
-		if(armor)
+		//if(armor)
 		{
+			float p_armor = armor;
 			if(autocvar_hud_panel_healtharmor_progressbar)
 			{
-				float p_armor;
-				p_armor = armor;
 				if (autocvar_hud_panel_healtharmor_progressbar_gfx)
 				{
 					if (autocvar_hud_panel_healtharmor_progressbar_gfx_smooth > 0)
@@ -250,8 +249,10 @@ void HUD_HealthArmor()
 					}
 					prev_armor = armor;
 				}
-				HUD_Panel_DrawProgressBar(pos + armor_offset, mySize, autocvar_hud_panel_healtharmor_progressbar_armor, p_armor/maxarmor, is_vertical, armor_baralign, autocvar_hud_progressbar_armor_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+				if(p_armor)
+					HUD_Panel_DrawProgressBar(pos + armor_offset, mySize, autocvar_hud_panel_healtharmor_progressbar_armor, p_armor/maxarmor, is_vertical, armor_baralign, autocvar_hud_progressbar_armor_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
 			}
+			if(!autocvar_hud_panel_healtharmor_progressbar || p_armor)
 			if(autocvar_hud_panel_healtharmor_text)
 				DrawNumIcon(pos + armor_offset, mySize, armor, "armor", is_vertical, armor_iconalign, HUD_Get_Num_Color(armor, maxarmor), 1);
 		}