X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fhealtharmor.qc;h=1a61a96d3d1c90bad00b39a7f0fa79ddf9a181c8;hp=36e3a8d907656a3ef28489cc324c9e303b70ec7e;hb=016835f8f51aff29719995f8d080d9c1b19392c4;hpb=b721a3ee61a4d3d2d894fe817fb1efdb551052b6

diff --git a/qcsrc/client/hud/panel/healtharmor.qc b/qcsrc/client/hud/panel/healtharmor.qc
index 36e3a8d907..1a61a96d3d 100644
--- a/qcsrc/client/hud/panel/healtharmor.qc
+++ b/qcsrc/client/hud/panel/healtharmor.qc
@@ -81,6 +81,13 @@ void HUD_HealthArmor()
 		mySize -= '2 2 0' * panel_bg_padding;
 	}
 
+	float air_alpha = 1;
+	if (STAT(AIR_FINISHED) && time > STAT(AIR_FINISHED))
+	{
+		air_alpha = blink_synced(0.5, 0.5, 7, STAT(AIR_FINISHED), -1);
+		air_time = 10;
+	}
+
 	int baralign = autocvar_hud_panel_healtharmor_baralign;
 	int iconalign = autocvar_hud_panel_healtharmor_iconalign;
 
@@ -115,7 +122,7 @@ void HUD_HealthArmor()
 		if(fuel)
 			HUD_Panel_DrawProgressBar(pos, vec2(mySize.x, 0.2 * mySize.y), "progressbar", fuel/100, 0, (baralign == 1 || baralign == 3), autocvar_hud_progressbar_fuel_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL);
 		if(air_time)
-			HUD_Panel_DrawProgressBar(pos + eY * 0.8 * mySize.y, vec2(mySize.x, 0.2 * mySize.y), "progressbar", air_time / 10, 0, (baralign == 1 || baralign == 3), autocvar_hud_progressbar_oxygen_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL);
+			HUD_Panel_DrawProgressBar(pos + eY * 0.8 * mySize.y, vec2(mySize.x, 0.2 * mySize.y), "progressbar", air_time / 10, 0, (baralign == 1 || baralign == 3), autocvar_hud_progressbar_oxygen_color, air_alpha * panel_fg_alpha * 0.8, DRAWFLAG_NORMAL);
 	}
 	else
 	{
@@ -201,10 +208,7 @@ void HUD_HealthArmor()
 
 					if (health <= autocvar_hud_panel_healtharmor_progressbar_gfx_lowhealth)
 					{
-						float BLINK_FACTOR = 0.15;
-						float BLINK_BASE = 0.85;
-						float BLINK_FREQ = 9;
-						pain_health_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ);
+						pain_health_alpha = blink(0.85, 0.15, 9);
 					}
 				}
 				HUD_Panel_DrawProgressBar(pos + health_offset, mySize, autocvar_hud_panel_healtharmor_progressbar_health, p_health/maxhealth, is_vertical, health_baralign, autocvar_hud_progressbar_health_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * pain_health_alpha, DRAWFLAG_NORMAL);
@@ -283,7 +287,7 @@ void HUD_HealthArmor()
 					pos.x += cell_size.x - mySize.x;
 				else
 					pos.y += cell_size.y - mySize.y;
-				HUD_Panel_DrawProgressBar(pos, mySize, "progressbar", air_time / 10, is_vertical, air_align, autocvar_hud_progressbar_oxygen_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL);
+				HUD_Panel_DrawProgressBar(pos, mySize, "progressbar", air_time / 10, is_vertical, air_align, autocvar_hud_progressbar_oxygen_color, air_alpha * panel_fg_alpha * 0.8, DRAWFLAG_NORMAL);
 			}
 		}
 	}