From: terencehill Date: Sun, 6 Feb 2011 16:03:45 +0000 (+0100) Subject: Let's use "progressbar" everywhere, for images too, to not messing the things up... X-Git-Tag: xonotic-v0.5.0~314 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8c621a7cc70307a74994ab5e368d3f08e65fcb5f;p=xonotic%2Fxonotic-data.pk3dir.git Let's use "progressbar" everywhere, for images too, to not messing the things up with names in the future --- diff --git a/gfx/hud/default/progressbar.tga b/gfx/hud/default/progressbar.tga new file mode 100644 index 000000000..987c8f544 Binary files /dev/null and b/gfx/hud/default/progressbar.tga differ diff --git a/gfx/hud/default/progressbar_vertical.tga b/gfx/hud/default/progressbar_vertical.tga new file mode 100644 index 000000000..3c2d1a8e0 Binary files /dev/null and b/gfx/hud/default/progressbar_vertical.tga differ diff --git a/gfx/hud/default/statusbar.tga b/gfx/hud/default/statusbar.tga deleted file mode 100644 index 987c8f544..000000000 Binary files a/gfx/hud/default/statusbar.tga and /dev/null differ diff --git a/gfx/hud/default/statusbar_vertical.tga b/gfx/hud/default/statusbar_vertical.tga deleted file mode 100644 index 3c2d1a8e0..000000000 Binary files a/gfx/hud/default/statusbar_vertical.tga and /dev/null differ diff --git a/gfx/hud/luminos/progressbar.tga b/gfx/hud/luminos/progressbar.tga new file mode 100644 index 000000000..987c8f544 Binary files /dev/null and b/gfx/hud/luminos/progressbar.tga differ diff --git a/gfx/hud/luminos/progressbar_vertical.tga b/gfx/hud/luminos/progressbar_vertical.tga new file mode 100644 index 000000000..3c2d1a8e0 Binary files /dev/null and b/gfx/hud/luminos/progressbar_vertical.tga differ diff --git a/gfx/hud/luminos/statusbar.tga b/gfx/hud/luminos/statusbar.tga deleted file mode 100644 index 987c8f544..000000000 Binary files a/gfx/hud/luminos/statusbar.tga and /dev/null differ diff --git a/gfx/hud/luminos/statusbar_vertical.tga b/gfx/hud/luminos/statusbar_vertical.tga deleted file mode 100644 index 3c2d1a8e0..000000000 Binary files a/gfx/hud/luminos/statusbar_vertical.tga and /dev/null differ diff --git a/gfx/hud/luminos_xhair/progressbar_ammo.tga b/gfx/hud/luminos_xhair/progressbar_ammo.tga new file mode 100644 index 000000000..9db210f73 Binary files /dev/null and b/gfx/hud/luminos_xhair/progressbar_ammo.tga differ diff --git a/gfx/hud/luminos_xhair/progressbar_armor_vertical.tga b/gfx/hud/luminos_xhair/progressbar_armor_vertical.tga new file mode 100644 index 000000000..0eb29726c Binary files /dev/null and b/gfx/hud/luminos_xhair/progressbar_armor_vertical.tga differ diff --git a/gfx/hud/luminos_xhair/progressbar_health_vertical.tga b/gfx/hud/luminos_xhair/progressbar_health_vertical.tga new file mode 100644 index 000000000..1bfe49b1b Binary files /dev/null and b/gfx/hud/luminos_xhair/progressbar_health_vertical.tga differ diff --git a/gfx/hud/luminos_xhair/statusbar_ammo.tga b/gfx/hud/luminos_xhair/statusbar_ammo.tga deleted file mode 100644 index 9db210f73..000000000 Binary files a/gfx/hud/luminos_xhair/statusbar_ammo.tga and /dev/null differ diff --git a/gfx/hud/luminos_xhair/statusbar_armor_vertical.tga b/gfx/hud/luminos_xhair/statusbar_armor_vertical.tga deleted file mode 100644 index 0eb29726c..000000000 Binary files a/gfx/hud/luminos_xhair/statusbar_armor_vertical.tga and /dev/null differ diff --git a/gfx/hud/luminos_xhair/statusbar_health_vertical.tga b/gfx/hud/luminos_xhair/statusbar_health_vertical.tga deleted file mode 100644 index 1bfe49b1b..000000000 Binary files a/gfx/hud/luminos_xhair/statusbar_health_vertical.tga and /dev/null differ diff --git a/gfx/hud/old/progressbar.tga b/gfx/hud/old/progressbar.tga new file mode 100644 index 000000000..0bbad1787 Binary files /dev/null and b/gfx/hud/old/progressbar.tga differ diff --git a/gfx/hud/old/progressbar_vertical.tga b/gfx/hud/old/progressbar_vertical.tga new file mode 100644 index 000000000..d63a37fc0 Binary files /dev/null and b/gfx/hud/old/progressbar_vertical.tga differ diff --git a/gfx/hud/old/statusbar.tga b/gfx/hud/old/statusbar.tga deleted file mode 100644 index 0bbad1787..000000000 Binary files a/gfx/hud/old/statusbar.tga and /dev/null differ diff --git a/gfx/hud/old/statusbar_vertical.tga b/gfx/hud/old/statusbar_vertical.tga deleted file mode 100644 index d63a37fc0..000000000 Binary files a/gfx/hud/old/statusbar_vertical.tga and /dev/null differ diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 4e3201e0d..df510eeb5 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -444,7 +444,7 @@ void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, flo if(vertical) { pic = strcat(hud_skin_path, "/", pic, "_vertical"); if(precache_pic(pic) == "") { - pic = "gfx/hud/default/statusbar_vertical"; + pic = "gfx/hud/default/progressbar_vertical"; } if (baralign == 1) // bottom align @@ -486,7 +486,7 @@ void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, flo } else { pic = strcat(hud_skin_path, "/", pic); if(precache_pic(pic) == "") { - pic = "gfx/hud/default/statusbar"; + pic = "gfx/hud/default/progressbar"; } if (baralign == 1) // right align @@ -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, "statusbar", 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, "progressbar", 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, "statusbar", fuel/100, is_vertical, fuel_baralign, progressbar_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(pos, mySize, "progressbar", fuel/100, is_vertical, fuel_baralign, progressbar_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); } } } @@ -3499,9 +3499,9 @@ void HUD_Mod_NexBall(vector pos, vector mySize) //Draw the filling HUD_Panel_GetProgressBarColor(nexball); if(mySize_x > mySize_y) - HUD_Panel_DrawProgressBar(pos, mySize, "statusbar", p, 0, 0, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(pos, mySize, "progressbar", p, 0, 0, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); else - HUD_Panel_DrawProgressBar(pos, mySize, "statusbar", p, 1, 0, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(pos, mySize, "progressbar", p, 1, 0, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } if (stat_items & IT_KEY1) @@ -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, "statusbar", 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, "progressbar", 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, "statusbar", 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, "progressbar", 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);