From 67f42968e72c88efd470a9d7b0ea674c6c253334 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Mon, 29 Nov 2010 18:46:18 +0200 Subject: [PATCH] allow changing the progressbar per-panel-item --- _hud_descriptions.cfg | 5 +++ hud_luminos.cfg | 5 +++ hud_luminos_minimal.cfg | 5 +++ qcsrc/client/hud.qc | 78 ++++++++++++++++++++++++++--------------- 4 files changed, 64 insertions(+), 29 deletions(-) diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg index ddcd45a364..df3e431ab5 100644 --- a/_hud_descriptions.cfg +++ b/_hud_descriptions.cfg @@ -73,6 +73,8 @@ seta hud_panel_powerups_bg_alpha "" "if set to something else than \"\" = overri seta hud_panel_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background" seta hud_panel_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" seta hud_panel_powerups_progressbar "" "enable progressbar in panel" +seta hud_panel_healtharmor_progressbar_strength "" "progressbar image for strength" +seta hud_panel_healtharmor_progressbar_shield "" "progressbar image for shield" seta hud_panel_healtharmor "" "enable/disable this panel, 2 = combined health/armor display" seta hud_panel_healtharmor_pos "" "position of this panel" @@ -87,6 +89,9 @@ seta hud_panel_healtharmor_bg_alpha "" "if set to something else than \"\" = ove seta hud_panel_healtharmor_bg_border "" "if set to something else than \"\" = override default size of border around the background" seta hud_panel_healtharmor_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" seta hud_panel_healtharmor_progressbar "" "enable progressbar in panel" +seta hud_panel_healtharmor_progressbar_health "" "progressbar image for health" +seta hud_panel_healtharmor_progressbar_armor "" "progressbar image for armor" +seta hud_panel_healtharmor_text "1" "show text/icons in the healtharmor panel" seta hud_panel_notify "" "enable/disable this panel" seta hud_panel_notify_pos "" "position of this base of the panel" diff --git a/hud_luminos.cfg b/hud_luminos.cfg index 0ded419425..fbf7fe55b8 100644 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@ -71,6 +71,8 @@ seta hud_panel_powerups_flip "1" seta hud_panel_powerups_iconalign "4" seta hud_panel_powerups_baralign "4" seta hud_panel_powerups_progressbar "1" +seta hud_panel_powerups_progressbar_strength "progressbar" +seta hud_panel_powerups_progressbar_shield "progressbar" seta hud_panel_healtharmor 1 seta hud_panel_healtharmor_pos "0.330000 0.920000" @@ -85,6 +87,9 @@ seta hud_panel_healtharmor_flip "0" seta hud_panel_healtharmor_iconalign "4" seta hud_panel_healtharmor_baralign "4" seta hud_panel_healtharmor_progressbar "1" +seta hud_panel_healtharmor_progressbar_health "progressbar" +seta hud_panel_healtharmor_progressbar_armor "progressbar" +seta hud_panel_healtharmor_text "1" seta hud_panel_notify 1 seta hud_panel_notify_pos "0.660000 0.730000" diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg index 2e2bdece21..f3c1473943 100644 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@ -71,6 +71,8 @@ seta hud_panel_powerups_flip "1" seta hud_panel_powerups_iconalign "1" seta hud_panel_powerups_baralign "1" seta hud_panel_powerups_progressbar "1" +seta hud_panel_healtharmor_progressbar_strength "progressbar" +seta hud_panel_healtharmor_progressbar_shield "progressbar" seta hud_panel_healtharmor 1 seta hud_panel_healtharmor_pos "0.350000 0.890000" @@ -85,6 +87,9 @@ seta hud_panel_healtharmor_flip "0" seta hud_panel_healtharmor_iconalign "3" seta hud_panel_healtharmor_baralign "3" seta hud_panel_healtharmor_progressbar "1" +seta hud_panel_healtharmor_progressbar_health "progressbar" +seta hud_panel_healtharmor_progressbar_armor "progressbar" +seta hud_panel_healtharmor_text "1" seta hud_panel_notify 1 seta hud_panel_notify_pos "0 0" diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index d703552d81..fde150d033 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -497,12 +497,17 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_PanelCvar_q("_iconalign"); HUD_Write_PanelCvar_q("_baralign"); HUD_Write_PanelCvar_q("_progressbar"); + HUD_Write_PanelCvar_q("_progressbar_strength"); + HUD_Write_PanelCvar_q("_progressbar_shield"); break; case HUD_PANEL_HEALTHARMOR: HUD_Write_PanelCvar_q("_flip"); HUD_Write_PanelCvar_q("_iconalign"); HUD_Write_PanelCvar_q("_baralign"); HUD_Write_PanelCvar_q("_progressbar"); + HUD_Write_PanelCvar_q("_progressbar_health"); + HUD_Write_PanelCvar_q("_progressbar_armor"); + HUD_Write_PanelCvar_q("_text"); break; case HUD_PANEL_NOTIFY: HUD_Write_PanelCvar_q("_flip"); @@ -553,16 +558,15 @@ if(highlightedPanel_prev == active_panel && autocvar__hud_configure)\ HUD_Panel_HlBorder(panel_bg_border + 1.5 * hlBorderSize, '0 0.5 1', 0.25 * (1 - autocvar__menu_alpha) * alpha);\ } ENDS_WITH_CURLY_BRACE -void HUD_Panel_DrawProgressBar(vector pos, vector mySize, float vertical, float barflip, float x, vector color, float alpha, float drawflag) +void HUD_Panel_DrawProgressBar(vector pos, vector mySize, string pic, float vertical, float barflip, float x, vector color, float alpha, float drawflag) { if(!alpha || x == 0) return; x = bound(0, x, 1); - string pic; if(vertical) { - pic = strcat(hud_skin_path, "/statusbar_vertical"); + pic = strcat(hud_skin_path, "/", pic, "_vertical"); if(precache_pic(pic) == "") { pic = "gfx/hud/default/statusbar_vertical"; } @@ -572,7 +576,7 @@ void HUD_Panel_DrawProgressBar(vector pos, vector mySize, float vertical, float else drawsetcliparea(pos_x, pos_y, mySize_x, mySize_y * x); } else { - pic = strcat(hud_skin_path, "/statusbar"); + pic = strcat(hud_skin_path, "/", pic); if(precache_pic(pic) == "") { pic = "gfx/hud/default/statusbar"; } @@ -2106,23 +2110,28 @@ void HUD_Powerups(void) { vector numpos; string leftname, rightname; + string leftprogressname, rightprogressname; float leftcnt, rightcnt; float leftexact, rightexact; float flip = cvar("hud_panel_powerups_flip"); if (flip) { leftname = "strength"; + leftprogressname = cvar_string("hud_panel_powerups_progressbar_strength"); leftcnt = ceil(strength_time); leftexact = strength_time; rightname = "shield"; + rightprogressname = cvar_string("hud_panel_powerups_progressbar_shield"); rightcnt = ceil(shield_time); rightexact = shield_time; } else { leftname = "shield"; + leftprogressname = cvar_string("hud_panel_powerups_progressbar_shield"); leftcnt = ceil(shield_time); leftexact = shield_time; rightname = "strength"; + rightprogressname = cvar_string("hud_panel_powerups_progressbar_strength"); rightcnt = ceil(strength_time); rightexact = strength_time; } @@ -2148,7 +2157,7 @@ void HUD_Powerups(void) { if(progressbar) { HUD_Panel_GetProgressBarColorForString(leftname); - HUD_Panel_DrawProgressBar(barpos, barsize, 0, barflip, min(1, leftcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, leftprogressname, 0, barflip, min(1, leftcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); } if(leftcnt > 1) DrawNumIcon(iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); @@ -2169,7 +2178,7 @@ void HUD_Powerups(void) { if(progressbar) { HUD_Panel_GetProgressBarColorForString(rightname); - HUD_Panel_DrawProgressBar(barpos, barsize, 0, barflip, min(1, rightcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, rightprogressname, 0, barflip, min(1, rightcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); } if(rightcnt > 1) DrawNumIcon(iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, '1 1 1', 1); @@ -2192,7 +2201,7 @@ void HUD_Powerups(void) { if(progressbar) { HUD_Panel_GetProgressBarColorForString(leftname); - HUD_Panel_DrawProgressBar(barpos, barsize, 0, barflip, min(1, leftcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, leftprogressname, 0, barflip, min(1, leftcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); } if(leftcnt > 1) DrawNumIcon(iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); @@ -2212,7 +2221,7 @@ void HUD_Powerups(void) { if(progressbar) { HUD_Panel_GetProgressBarColorForString(rightname); - HUD_Panel_DrawProgressBar(barpos, barsize, 0, barflip, min(1, rightcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, rightprogressname, 0, barflip, min(1, rightcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); } if(rightcnt > 1) DrawNumIcon(iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, '1 1 1', 1); @@ -2243,7 +2252,7 @@ void HUD_Powerups(void) { if(progressbar) { HUD_Panel_GetProgressBarColorForString(leftname); - HUD_Panel_DrawProgressBar(barpos, barsize, 1, barflip, min(1, leftcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, leftprogressname, 1, barflip, min(1, leftcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); } if(leftcnt <= 5) drawpic_aspect_skin_expanding(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, bound(0, (leftcnt - leftexact) / 0.5, 1)); @@ -2272,7 +2281,7 @@ void HUD_Powerups(void) { if(progressbar) { HUD_Panel_GetProgressBarColorForString(rightname); - HUD_Panel_DrawProgressBar(barpos, barsize, 1, barflip, min(1, rightcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, rightprogressname, 1, barflip, min(1, rightcnt/30), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); } if(rightcnt <= 5) drawpic_aspect_skin_expanding(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, bound(0, (rightcnt - rightexact) / 0.5, 1)); @@ -2350,9 +2359,10 @@ void HUD_HealthArmor(void) if(progressbar) { HUD_Panel_GetProgressBarColor(health); - HUD_Panel_DrawProgressBar(barpos, barsize, 0, mod(baralign, 2), x/maxtotal, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, cvar_string("hud_panel_healtharmor_progressbar_health"), 0, mod(baralign, 2), x/maxtotal, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } if(armor) + if(cvar("hud_panel_healtharmor_text")) drawpic_aspect_skin(pos + eX * mySize_x - eX * 0.5 * mySize_y, "armor", '0.5 0.5 0' * mySize_y, '1 1 1', panel_fg_alpha * armor / health, DRAWFLAG_NORMAL); } else @@ -2361,9 +2371,10 @@ void HUD_HealthArmor(void) if(progressbar) { HUD_Panel_GetProgressBarColor(armor); - HUD_Panel_DrawProgressBar(barpos, barsize, 0, mod(baralign, 2), x/maxtotal, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, cvar_string("hud_panel_healtharmor_progressbar_armor"), 0, mod(baralign, 2), x/maxtotal, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } if(health) + if(cvar("hud_panel_healtharmor_text")) 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); } DrawNumIcon(iconalign, pos, mySize, x, biggercount, 1, HUD_Get_Num_Color(x, maxtotal), 1); @@ -2374,12 +2385,13 @@ void HUD_HealthArmor(void) barpos = pos; barsize = eX * mySize_x + eY * 0.2 * mySize_y; HUD_Panel_GetProgressBarColor(fuel); - HUD_Panel_DrawProgressBar(barpos, barsize, 0, mod(baralign, 2), min(1, fuel/100), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, "progressbar", 0, mod(baralign, 2), min(1, fuel/100), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); } } else { string leftname, rightname; + string leftprogressname, rightprogressname; float leftcnt, rightcnt; float leftmax, rightmax; float leftactive, rightactive; @@ -2388,6 +2400,7 @@ void HUD_HealthArmor(void) float barflip; if (flip) { // old style layout with armor left/top of health leftname = "armor"; + leftprogressname = cvar_string("hud_panel_healtharmor_progressbar_armor"); leftcnt = armor; if(leftcnt) leftactive = 1; @@ -2395,18 +2408,21 @@ void HUD_HealthArmor(void) leftmax = maxarmor; rightname = "health"; + rightprogressname = cvar_string("hud_panel_healtharmor_progressbar_health"); rightcnt = health; rightactive = 1; rightalpha = 1; rightmax = maxhealth; } else { leftname = "health"; + leftprogressname = cvar_string("hud_panel_healtharmor_progressbar_health"); leftcnt = health; leftactive = 1; leftalpha = 1; leftmax = maxhealth; rightname = "armor"; + rightprogressname = cvar_string("hud_panel_healtharmor_progressbar_armor"); rightcnt = armor; if(rightcnt) rightactive = 1; @@ -2429,9 +2445,10 @@ void HUD_HealthArmor(void) if(progressbar) { HUD_Panel_GetProgressBarColorForString(leftname); - HUD_Panel_DrawProgressBar(barpos, barsize, 0, barflip, min(1, leftcnt/leftmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, leftprogressname, 0, barflip, min(1, leftcnt/leftmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } - DrawNumIcon(iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, leftmax), 1); + if(cvar("hud_panel_healtharmor_text")) + DrawNumIcon(iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, leftmax), 1); } if(rightactive) @@ -2446,9 +2463,10 @@ void HUD_HealthArmor(void) if(progressbar) { HUD_Panel_GetProgressBarColorForString(rightname); - HUD_Panel_DrawProgressBar(barpos, barsize, 0, barflip, min(1, rightcnt/rightmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, rightprogressname, 0, barflip, min(1, rightcnt/rightmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } - DrawNumIcon(iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(rightcnt, rightmax), 1); + if(cvar("hud_panel_healtharmor_text")) + DrawNumIcon(iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(rightcnt, rightmax), 1); } if(fuel) @@ -2456,7 +2474,7 @@ void HUD_HealthArmor(void) barpos = pos; barsize = eX * mySize_x + eY * 0.2 * mySize_y; HUD_Panel_GetProgressBarColor(fuel); - HUD_Panel_DrawProgressBar(barpos, barsize, 0, mod(baralign, 2), min(1, fuel/100), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, "progressbar", 0, mod(baralign, 2), min(1, fuel/100), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); } } else if (mySize_x/mySize_y > 1.5) @@ -2474,9 +2492,10 @@ void HUD_HealthArmor(void) if(progressbar) { HUD_Panel_GetProgressBarColorForString(leftname); - HUD_Panel_DrawProgressBar(barpos, barsize, 0, barflip, min(1, leftcnt/leftmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, leftprogressname, 0, barflip, min(1, leftcnt/leftmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } - DrawNumIcon(iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, leftmax), 1); + if(cvar("hud_panel_healtharmor_text")) + DrawNumIcon(iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, leftmax), 1); } if(rightactive) @@ -2491,9 +2510,10 @@ void HUD_HealthArmor(void) if(progressbar) { HUD_Panel_GetProgressBarColorForString(rightname); - HUD_Panel_DrawProgressBar(barpos, barsize, 0, barflip, min(1, rightcnt/rightmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, rightprogressname, 0, barflip, min(1, rightcnt/rightmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } - DrawNumIcon(iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(rightcnt, rightmax), 1); + if(cvar("hud_panel_healtharmor_text")) + DrawNumIcon(iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(rightcnt, rightmax), 1); } if(fuel) @@ -2501,7 +2521,7 @@ void HUD_HealthArmor(void) barpos = pos; barsize = eX * mySize_x + eY * 0.2 * mySize_y; HUD_Panel_GetProgressBarColor(fuel); - HUD_Panel_DrawProgressBar(barpos, barsize, 0, mod(baralign, 2), min(1, fuel/100), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, "progressbar", 0, mod(baralign, 2), min(1, fuel/100), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); } } else @@ -2527,7 +2547,7 @@ void HUD_HealthArmor(void) if(progressbar) { HUD_Panel_GetProgressBarColorForString(leftname); - HUD_Panel_DrawProgressBar(barpos, barsize, 1, barflip, min(1, leftcnt/leftmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, leftprogressname, 1, barflip, min(1, leftcnt/leftmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } drawpic_aspect_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * panel_fg_alpha, DRAWFLAG_NORMAL); drawstring_aspect(numpos, ftos(leftcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, HUD_Get_Num_Color(leftcnt, leftmax), panel_fg_alpha, DRAWFLAG_NORMAL); @@ -2553,7 +2573,7 @@ void HUD_HealthArmor(void) if(progressbar) { HUD_Panel_GetProgressBarColorForString(rightname); - HUD_Panel_DrawProgressBar(barpos, barsize, 1, barflip, min(1, rightcnt/rightmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, rightprogressname, 1, barflip, min(1, rightcnt/rightmax), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } drawpic_aspect_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * panel_fg_alpha, DRAWFLAG_NORMAL); drawstring_aspect(numpos, ftos(rightcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, HUD_Get_Num_Color(rightcnt, rightmax), panel_fg_alpha, DRAWFLAG_NORMAL); @@ -2564,7 +2584,7 @@ void HUD_HealthArmor(void) barpos = pos; barsize = eX * 0.05 * mySize_x + eY * mySize_y; HUD_Panel_GetProgressBarColor(fuel); - HUD_Panel_DrawProgressBar(barpos, barsize, 1, mod(baralign, 2), min(1, fuel/100), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(barpos, barsize, "progressbar", 1, mod(baralign, 2), min(1, fuel/100), progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); } } } @@ -4326,7 +4346,7 @@ void HUD_Mod_NexBall(vector pos, vector mySize) vertical = 1; } HUD_Panel_GetProgressBarColor(nexball); - HUD_Panel_DrawProgressBar(pos, mySize, vertical, 0, p, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(pos, mySize, "statusbar", vertical, 0, p, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } if (stat_items & IT_KEY1) @@ -5001,9 +5021,9 @@ void HUD_ShowAcceleration(void) } if (acceleration > 0) - HUD_Panel_DrawProgressBar(pos, eX * (vid_conwidth - pos_x) + eY * sz, 0, 0, acceleration * scale, rgb, alpha * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(pos, eX * (vid_conwidth - pos_x) + eY * sz, "statusbar", 0, 0, acceleration * scale, rgb, alpha * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); else - HUD_Panel_DrawProgressBar(eY * pos_y, eX * pos_x + eY * sz, 0, 1, -acceleration * scale, rgb, alpha * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(eY * pos_y, eX * pos_x + eY * sz, "statusbar", 0, 1, -acceleration * scale, rgb, alpha * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } void HUD_Reset (void) -- 2.39.2