X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fhealtharmor.qc;h=5a3214ad99e15a91cd8320951ec9cd8bbd6fa437;hb=db280a66b7b7ac88eaf779e80d71373c8d09cc98;hp=1a61a96d3d1c90bad00b39a7f0fa79ddf9a181c8;hpb=f47e7d1bce9b9a475c5b237e590ed935fd061d5e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/healtharmor.qc b/qcsrc/client/hud/panel/healtharmor.qc
index 1a61a96d3d..5a3214ad99 100644
--- a/qcsrc/client/hud/panel/healtharmor.qc
+++ b/qcsrc/client/hud/panel/healtharmor.qc
@@ -1,12 +1,26 @@
 #include "healtharmor.qh"
 
-#include <client/defs.qh>
-#include <client/miscfunctions.qh>
+#include <client/draw.qh>
 
 #include <common/deathtypes/all.qh>
 
 // Health/armor (#3)
 
+void HUD_HealthArmor_Export(int fh)
+{
+	// allow saving cvars that aesthetically change the panel into hud skin files
+	HUD_Write_Cvar("hud_panel_healtharmor_combined");
+	HUD_Write_Cvar("hud_panel_healtharmor_flip");
+	HUD_Write_Cvar("hud_panel_healtharmor_iconalign");
+	HUD_Write_Cvar("hud_panel_healtharmor_baralign");
+	HUD_Write_Cvar("hud_panel_healtharmor_progressbar");
+	HUD_Write_Cvar("hud_panel_healtharmor_progressbar_health");
+	HUD_Write_Cvar("hud_panel_healtharmor_progressbar_armor");
+	HUD_Write_Cvar("hud_panel_healtharmor_progressbar_gfx");
+	HUD_Write_Cvar("hud_panel_healtharmor_progressbar_gfx_smooth");
+	HUD_Write_Cvar("hud_panel_healtharmor_text");
+}
+
 void HUD_HealthArmor()
 {
 	int armor, health, fuel, air_time;
@@ -117,7 +131,7 @@ void HUD_HealthArmor()
 				drawpic_aspect_skin(pos + eX * mySize.x - eX * 0.5 * mySize.y, "health", '0.5 0.5 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 		}
 		if(autocvar_hud_panel_healtharmor_text)
-			DrawNumIcon(pos, mySize, hp, biggercount, 0, iconalign, HUD_Get_Num_Color(hp, maxtotal), 1);
+			DrawNumIcon(pos, mySize, hp, biggercount, 0, iconalign, HUD_Get_Num_Color(hp, maxtotal, true), 1);
 
 		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);
@@ -214,7 +228,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, health_iconalign, HUD_Get_Num_Color(health, maxhealth), 1);
+				DrawNumIcon(pos + health_offset, mySize, health, "health", is_vertical, health_iconalign, HUD_Get_Num_Color(health, maxhealth, true), 1);
 		}
 
 		//if(armor)
@@ -261,7 +275,7 @@ void HUD_HealthArmor()
 			}
 			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);
+				DrawNumIcon(pos + armor_offset, mySize, armor, "armor", is_vertical, armor_iconalign, HUD_Get_Num_Color(armor, maxarmor, true), 1);
 		}
 
 		vector cell_size = mySize;