Show negative health

diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh
index d45cb90b184561cb574013ff8da28a78c1955dd7..a97fda141d87a319f4a8d568508e7a5cb9f65af0 100644 (file)
--- a/qcsrc/client/hud/hud.qh
+++ b/qcsrc/client/hud/hud.qh
@@ -277,7 +277,7 @@ REGISTER_HUD_PANEL(ITEMSTIME,       HUD_ItemsTime,      PANEL_CONFIG_MAIN | PANE
 REGISTER_HUD_PANEL(QUICKMENU,       HUD_QuickMenu,      PANEL_CONFIG_MAIN                        , PANEL_SHOW_MAINGAME | PANEL_SHOW_MINIGAME                                          ) // QUICKMENU
 REGISTER_HUD_PANEL(SCOREBOARD,      Scoreboard_Draw,    PANEL_CONFIG_NO                          , PANEL_SHOW_MAINGAME | PANEL_SHOW_MINIGAME | PANEL_SHOW_MAPVOTE | PANEL_SHOW_WITH_SB) // SCOREBOARD
 REGISTER_HUD_PANEL(STRAFEHUD,       HUD_StrafeHUD,      PANEL_CONFIG_MAIN | PANEL_CONFIG_CANBEOFF, PANEL_SHOW_MAINGAME                                                                ) // STRAFEHUD
-REGISTER_HUD_PANEL(SPECTHUD,        HUD_SpectHUD,       PANEL_CONFIG_NO | PANEL_CONFIG_CANBEOFF, PANEL_SHOW_MAINGAME) // SPECTHUD
+REGISTER_HUD_PANEL(SPECTHUD,        HUD_SpectHUD,       PANEL_CONFIG_NO   | PANEL_CONFIG_CANBEOFF, PANEL_SHOW_MAINGAME                                                                ) // SPECTHUD
 // always add new panels to the end of list
 
 // Because calling lots of functions in QC apparently cuts fps in half on many machines:

diff --git a/qcsrc/client/hud/panel/healtharmor.qc b/qcsrc/client/hud/panel/healtharmor.qc
index f84a3733027ca22cebc904f0926749fef1a4d04e..e5320ebbda5fbcc4a9ac395490080de965d8fdcb 100644 (file)
--- a/qcsrc/client/hud/panel/healtharmor.qc
+++ b/qcsrc/client/hud/panel/healtharmor.qc
@@ -22,7 +22,7 @@ void HUD_HealthArmor_Export(int fh)
 
 void HUD_HealthArmor()
 {
-       int armor, health, fuel, air_time;
+       int armor, health, health_real, fuel, air_time;
        if(!autocvar__hud_configure)
        {
                if((!autocvar_hud_panel_healtharmor) || (spectatee_status == -1))
@@ -30,8 +30,10 @@ void HUD_HealthArmor()
                if(hud != HUD_NORMAL) return;
 
                health = STAT(HEALTH);
+               health_real = health;
                if(health <= 0)
                {
+                       health_real = max(health, -999);
                        health = 0;
                        prev_health = -1;
                        if(autocvar_hud_panel_healtharmor_hide_ondeath)
@@ -70,6 +72,7 @@ void HUD_HealthArmor()
        else
        {
                health = 150;
+               health_real = 150;
                armor = 75;
                fuel = 20;
                air_time = 6;
@@ -246,7 +249,7 @@ void HUD_HealthArmor()
                                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);
                        }
                        if(autocvar_hud_panel_healtharmor_text)
-                               DrawNumIcon(pos + health_offset, mySize, health, "health", is_vertical, false, health_iconalign, HUD_Get_Num_Color(health, maxhealth, true), 1);
+                               DrawNumIcon(pos + health_offset, mySize, health_real, "health", is_vertical, false, health_iconalign, HUD_Get_Num_Color(health, maxhealth, true), 1);
                }
 
                //if(armor)