Fix #2575 "FPS field no longer displayed in scoreboard with sv_showfps set"

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / panel / healtharmor.qc

diff --git a/qcsrc/client/hud/panel/healtharmor.qc b/qcsrc/client/hud/panel/healtharmor.qc
index 48b852bf95a1f79d538f42829f580c31be410d91..7e6e33339cdf68704ddd68ac79bcb46ed0bc6f42 100644 (file)
--- a/qcsrc/client/hud/panel/healtharmor.qc
+++ b/qcsrc/client/hud/panel/healtharmor.qc
@@ -1,8 +1,6 @@
 #include "healtharmor.qh"
 
-#include <client/main.qh>
-#include <client/miscfunctions.qh>
-
+#include <client/draw.qh>
 #include <common/deathtypes/all.qh>
 
 // Health/armor (#3)
@@ -96,12 +94,21 @@ void HUD_HealthArmor()
                mySize -= '2 2 0' * panel_bg_padding;
        }
 
-       float air_alpha = 1;
-       if (STAT(AIR_FINISHED) && time > STAT(AIR_FINISHED))
+       float air_alpha;
+       if (!STAT(AIR_FINISHED))
+               air_alpha = 0;
+       else if (time > STAT(AIR_FINISHED))
        {
                air_alpha = blink_synced(0.5, 0.5, 7, STAT(AIR_FINISHED), -1);
                air_time = 10;
        }
+       else
+       {
+               float fade_time = 10 / 2;
+               float start_alpha = autocvar_hud_panel_healtharmor_oxygenbar_startalpha;
+               float f = (STAT(AIR_FINISHED) - time - fade_time) / fade_time;
+               air_alpha = bound(0, start_alpha + (1 - start_alpha) * (1 - f), 1);
+       }
 
        int baralign = autocvar_hud_panel_healtharmor_baralign;
        int iconalign = autocvar_hud_panel_healtharmor_iconalign;