From 686da16a815fd4541a0f366cd03bcdcb571dedda Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 6 Feb 2011 15:46:12 +0100 Subject: [PATCH] Fix wrong image name for progressbars in healtharmor and physics panel, it should be statusbar like everyone else. --- .../{progressbar_ammo.tga => statusbar_ammo.tga} | Bin ...or_vertical.tga => statusbar_armor_vertical.tga} | Bin ...h_vertical.tga => statusbar_health_vertical.tga} | Bin qcsrc/client/hud.qc | 8 ++++---- 4 files changed, 4 insertions(+), 4 deletions(-) rename gfx/hud/luminos_xhair/{progressbar_ammo.tga => statusbar_ammo.tga} (100%) rename gfx/hud/luminos_xhair/{progressbar_armor_vertical.tga => statusbar_armor_vertical.tga} (100%) rename gfx/hud/luminos_xhair/{progressbar_health_vertical.tga => statusbar_health_vertical.tga} (100%) diff --git a/gfx/hud/luminos_xhair/progressbar_ammo.tga b/gfx/hud/luminos_xhair/statusbar_ammo.tga similarity index 100% rename from gfx/hud/luminos_xhair/progressbar_ammo.tga rename to gfx/hud/luminos_xhair/statusbar_ammo.tga diff --git a/gfx/hud/luminos_xhair/progressbar_armor_vertical.tga b/gfx/hud/luminos_xhair/statusbar_armor_vertical.tga similarity index 100% rename from gfx/hud/luminos_xhair/progressbar_armor_vertical.tga rename to gfx/hud/luminos_xhair/statusbar_armor_vertical.tga diff --git a/gfx/hud/luminos_xhair/progressbar_health_vertical.tga b/gfx/hud/luminos_xhair/statusbar_health_vertical.tga similarity index 100% rename from gfx/hud/luminos_xhair/progressbar_health_vertical.tga rename to gfx/hud/luminos_xhair/statusbar_health_vertical.tga diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 7eaae8cea..4e3201e0d 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -1407,7 +1407,7 @@ void HUD_HealthArmor(void) if(fuel) { HUD_Panel_GetProgressBarColor(fuel); - HUD_Panel_DrawProgressBar(pos, eX * mySize_x + eY * 0.2 * mySize_y, "progressbar", fuel/100, 0, (baralign == 1 || baralign == 3), progressbar_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(pos, eX * mySize_x + eY * 0.2 * mySize_y, "statusbar", fuel/100, 0, (baralign == 1 || baralign == 3), progressbar_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); } } else @@ -1546,7 +1546,7 @@ void HUD_HealthArmor(void) else if (panel_ar < 1/4) mySize_y *= 2; //restore full panel size HUD_Panel_GetProgressBarColor(fuel); - HUD_Panel_DrawProgressBar(pos, mySize, "progressbar", fuel/100, is_vertical, fuel_baralign, progressbar_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(pos, mySize, "statusbar", fuel/100, is_vertical, fuel_baralign, progressbar_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); } } } @@ -4314,7 +4314,7 @@ void HUD_Physics(void) if(autocvar_hud_panel_physics_progressbar == 1 || autocvar_hud_panel_physics_progressbar == 2) { HUD_Panel_GetProgressBarColor(speed); - HUD_Panel_DrawProgressBar(panel_pos + speed_offset, panel_size, "progressbar", speed/max_speed, 0, speed_baralign, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(panel_pos + speed_offset, panel_size, "statusbar", speed/max_speed, 0, speed_baralign, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } vector tmp_offset, tmp_size; if (autocvar_hud_panel_physics_text == 1 || autocvar_hud_panel_physics_text == 2) @@ -4412,7 +4412,7 @@ void HUD_Physics(void) HUD_Panel_GetProgressBarColor(acceleration_neg); else HUD_Panel_GetProgressBarColor(acceleration); - HUD_Panel_DrawProgressBar(panel_pos + acceleration_offset, panel_size, "progressbar", acceleration/autocvar_hud_panel_physics_acceleration_max, 0, acceleration_baralign, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(panel_pos + acceleration_offset, panel_size, "statusbar", acceleration/autocvar_hud_panel_physics_acceleration_max, 0, acceleration_baralign, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } if (autocvar_hud_panel_physics_text == 1 || autocvar_hud_panel_physics_text == 3) drawstring_aspect(panel_pos + acceleration_offset, strcat(ftos_decimals(acceleration, 2), "g"), panel_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); -- 2.39.2