From 68dfc57ff17009d5a819006d7d741e5a0c669f84 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Fri, 14 May 2010 18:38:22 +0300 Subject: [PATCH] move files into gfx/hud/old/ --- defaultXonotic.cfg | 4 +- gfx/hud/{sb_accuracy.tga => old/accuracy.tga} | Bin .../accuracy_bar.tga} | Bin gfx/hud/{sb_ammobg.tga => old/ammobg.tga} | Bin gfx/hud/{sb_armor.tga => old/armor.tga} | Bin gfx/hud/{border_oldhud.tga => old/border.tga} | Bin gfx/hud/{sb_bullets.tga => old/bullets.tga} | Bin gfx/hud/{sb_cells.tga => old/cells.tga} | Bin gfx/hud/{dock_oldhud.tga => old/dock.tga} | Bin .../flag_blue_carrying.tga} | Bin .../flag_blue_lost.tga} | Bin .../flag_blue_shielded.tga} | Bin .../flag_blue_taken.tga} | Bin .../flag_red_carrying.tga} | Bin .../flag_red_lost.tga} | Bin .../flag_red_shielded.tga} | Bin .../flag_red_taken.tga} | Bin gfx/hud/{sb_fuel.tga => old/fuel.tga} | Bin gfx/hud/{sb_health.tga => old/health.tga} | Bin .../highlight_1.tga} | Bin .../highlight_2.tga} | Bin .../highlight_3.tga} | Bin .../highlight_4.tga} | Bin gfx/hud/{keys => old}/key_backward.tga | Bin gfx/hud/{keys => old}/key_backward_inv.tga | Bin gfx/hud/{keys => old}/key_bg.tga | Bin gfx/hud/{keys => old}/key_crouch.tga | Bin gfx/hud/{keys => old}/key_crouch_inv.tga | Bin gfx/hud/{keys => old}/key_forward.tga | Bin gfx/hud/{keys => old}/key_forward_inv.tga | Bin gfx/hud/{keys => old}/key_jump.tga | Bin gfx/hud/{keys => old}/key_jump_inv.tga | Bin gfx/hud/{keys => old}/key_left.tga | Bin gfx/hud/{keys => old}/key_left_inv.tga | Bin gfx/hud/{keys => old}/key_right.tga | Bin gfx/hud/{keys => old}/key_right_inv.tga | Bin gfx/hud/{sb_kh_blue.tga => old/kh_blue.tga} | Bin .../kh_bluearrow.tga} | Bin gfx/hud/{sb_kh_pink.tga => old/kh_pink.tga} | Bin .../kh_pinkarrow.tga} | Bin gfx/hud/{sb_kh_red.tga => old/kh_red.tga} | Bin .../kh_redarrow.tga} | Bin .../{sb_kh_yellow.tga => old/kh_yellow.tga} | Bin .../kh_yellowarrow.tga} | Bin .../nexball_carrying.tga} | Bin gfx/hud/{ => old}/num_0.tga | Bin gfx/hud/{ => old}/num_0_stroke.tga | Bin gfx/hud/{ => old}/num_1.tga | Bin gfx/hud/{ => old}/num_1_stroke.tga | Bin gfx/hud/{ => old}/num_2.tga | Bin gfx/hud/{ => old}/num_2_stroke.tga | Bin gfx/hud/{ => old}/num_3.tga | Bin gfx/hud/{ => old}/num_3_stroke.tga | Bin gfx/hud/{ => old}/num_4.tga | Bin gfx/hud/{ => old}/num_4_stroke.tga | Bin gfx/hud/{ => old}/num_5.tga | Bin gfx/hud/{ => old}/num_5_stroke.tga | Bin gfx/hud/{ => old}/num_6.tga | Bin gfx/hud/{ => old}/num_6_stroke.tga | Bin gfx/hud/{ => old}/num_7.tga | Bin gfx/hud/{ => old}/num_7_stroke.tga | Bin gfx/hud/{ => old}/num_8.tga | Bin gfx/hud/{ => old}/num_8_stroke.tga | Bin gfx/hud/{ => old}/num_9.tga | Bin gfx/hud/{ => old}/num_9_stroke.tga | Bin gfx/hud/{ => old}/num_colon.tga | Bin gfx/hud/{ => old}/num_colon_stroke.tga | Bin gfx/hud/{ => old}/num_dot.tga | Bin gfx/hud/{ => old}/num_dot_stroke.tga | Bin gfx/hud/{ => old}/num_minus.tga | Bin gfx/hud/{ => old}/num_minus_stroke.tga | Bin gfx/hud/{ => old}/num_plus.tga | Bin gfx/hud/{ => old}/num_plus_stroke.tga | Bin .../newfail.tga => old/race_newfail.tga} | Bin .../race_newrankgreen.tga} | Bin .../race_newrankyellow.tga} | Bin .../race_newrecordserver.tga} | Bin .../newtime.tga => old/race_newtime.tga} | Bin gfx/hud/{ => old}/rifle_ring_1.tga | Bin gfx/hud/{ => old}/rifle_ring_2.tga | Bin gfx/hud/{ => old}/rifle_ring_3.tga | Bin gfx/hud/{ => old}/rifle_ring_4.tga | Bin gfx/hud/{ => old}/rifle_ring_5.tga | Bin gfx/hud/{ => old}/rifle_ring_6.tga | Bin gfx/hud/{ => old}/rifle_ring_7.tga | Bin gfx/hud/{ => old}/rifle_ring_8.tga | Bin gfx/hud/{sb_rocket.tga => old/rocket.tga} | Bin gfx/hud/{ => old}/sbar.tga | Bin .../scoreboard_bg.tga} | Bin .../scoreboard_tableheader.tga} | Bin gfx/hud/{sb_shells.tga => old/shells.tga} | Bin gfx/hud/{sb_shield.tga => old/shield.tga} | Bin gfx/hud/{ => old}/statusbar.tga | Bin gfx/hud/{sb_strength.tga => old/strength.tga} | Bin gfx/hud/{sb_timer.tga => old/timer.tga} | Bin gfx/hud/{sb_timerbg.tga => old/timerbg.tga} | Bin gfx/hud/{ => old}/voteprogress_back.tga | Bin gfx/hud/{ => old}/voteprogress_prog.tga | Bin gfx/hud/{ => old}/voteprogress_voted.tga | Bin gfx/hud/{inv_weapon0.tga => old/weapon0.tga} | Bin gfx/hud/{inv_weapon1.tga => old/weapon1.tga} | Bin .../{inv_weapon10.tga => old/weapon10.tga} | Bin .../{inv_weapon11.tga => old/weapon11.tga} | Bin .../{inv_weapon12.tga => old/weapon12.tga} | Bin .../{inv_weapon13.tga => old/weapon13.tga} | Bin .../{inv_weapon14.tga => old/weapon14.tga} | Bin .../{inv_weapon15.tga => old/weapon15.tga} | Bin gfx/hud/{inv_weapon2.tga => old/weapon2.tga} | Bin gfx/hud/{inv_weapon3.tga => old/weapon3.tga} | Bin gfx/hud/{inv_weapon4.tga => old/weapon4.tga} | Bin gfx/hud/{inv_weapon5.tga => old/weapon5.tga} | Bin gfx/hud/{inv_weapon6.tga => old/weapon6.tga} | Bin gfx/hud/{inv_weapon7.tga => old/weapon7.tga} | Bin gfx/hud/{inv_weapon8.tga => old/weapon8.tga} | Bin gfx/hud/{inv_weapon9.tga => old/weapon9.tga} | Bin .../weapon_hlacmod_renameit.tga} | Bin .../weaponcampingrifle.tga} | Bin .../weaponcrylink.tga} | Bin .../weaponelectro.tga} | Bin .../weaponfireball.tga} | Bin .../weapongrenadelauncher.tga} | Bin .../weaponhagar.tga} | Bin .../weaponhlac.tga} | Bin .../weaponhook.tga} | Bin .../weaponlaser.tga} | Bin .../weaponminstanex.tga} | Bin .../{inv_weaponnex.tga => old/weaponnex.tga} | Bin .../weaponporto.tga} | Bin .../weaponrocketlauncher.tga} | Bin .../weaponseeker.tga} | Bin .../weaponshotgun.tga} | Bin .../weapontuba.tga} | Bin .../{inv_weaponuzi.tga => old/weaponuzi.tga} | Bin qcsrc/client/hud.qc | 148 +++++++++--------- 134 files changed, 76 insertions(+), 76 deletions(-) rename gfx/hud/{sb_accuracy.tga => old/accuracy.tga} (100%) rename gfx/hud/{sb_accuracy_bar.tga => old/accuracy_bar.tga} (100%) rename gfx/hud/{sb_ammobg.tga => old/ammobg.tga} (100%) rename gfx/hud/{sb_armor.tga => old/armor.tga} (100%) rename gfx/hud/{border_oldhud.tga => old/border.tga} (100%) rename gfx/hud/{sb_bullets.tga => old/bullets.tga} (100%) rename gfx/hud/{sb_cells.tga => old/cells.tga} (100%) rename gfx/hud/{dock_oldhud.tga => old/dock.tga} (100%) rename gfx/hud/{sb_flag_blue_carrying.tga => old/flag_blue_carrying.tga} (100%) rename gfx/hud/{sb_flag_blue_lost.tga => old/flag_blue_lost.tga} (100%) rename gfx/hud/{sb_flag_blue_shielded.tga => old/flag_blue_shielded.tga} (100%) rename gfx/hud/{sb_flag_blue_taken.tga => old/flag_blue_taken.tga} (100%) rename gfx/hud/{sb_flag_red_carrying.tga => old/flag_red_carrying.tga} (100%) rename gfx/hud/{sb_flag_red_lost.tga => old/flag_red_lost.tga} (100%) rename gfx/hud/{sb_flag_red_shielded.tga => old/flag_red_shielded.tga} (100%) rename gfx/hud/{sb_flag_red_taken.tga => old/flag_red_taken.tga} (100%) rename gfx/hud/{sb_fuel.tga => old/fuel.tga} (100%) rename gfx/hud/{sb_health.tga => old/health.tga} (100%) rename gfx/hud/{sb_highlight_1.tga => old/highlight_1.tga} (100%) rename gfx/hud/{sb_highlight_2.tga => old/highlight_2.tga} (100%) rename gfx/hud/{sb_highlight_3.tga => old/highlight_3.tga} (100%) rename gfx/hud/{sb_highlight_4.tga => old/highlight_4.tga} (100%) rename gfx/hud/{keys => old}/key_backward.tga (100%) rename gfx/hud/{keys => old}/key_backward_inv.tga (100%) rename gfx/hud/{keys => old}/key_bg.tga (100%) rename gfx/hud/{keys => old}/key_crouch.tga (100%) rename gfx/hud/{keys => old}/key_crouch_inv.tga (100%) rename gfx/hud/{keys => old}/key_forward.tga (100%) rename gfx/hud/{keys => old}/key_forward_inv.tga (100%) rename gfx/hud/{keys => old}/key_jump.tga (100%) rename gfx/hud/{keys => old}/key_jump_inv.tga (100%) rename gfx/hud/{keys => old}/key_left.tga (100%) rename gfx/hud/{keys => old}/key_left_inv.tga (100%) rename gfx/hud/{keys => old}/key_right.tga (100%) rename gfx/hud/{keys => old}/key_right_inv.tga (100%) rename gfx/hud/{sb_kh_blue.tga => old/kh_blue.tga} (100%) rename gfx/hud/{sb_kh_bluearrow.tga => old/kh_bluearrow.tga} (100%) rename gfx/hud/{sb_kh_pink.tga => old/kh_pink.tga} (100%) rename gfx/hud/{sb_kh_pinkarrow.tga => old/kh_pinkarrow.tga} (100%) rename gfx/hud/{sb_kh_red.tga => old/kh_red.tga} (100%) rename gfx/hud/{sb_kh_redarrow.tga => old/kh_redarrow.tga} (100%) rename gfx/hud/{sb_kh_yellow.tga => old/kh_yellow.tga} (100%) rename gfx/hud/{sb_kh_yellowarrow.tga => old/kh_yellowarrow.tga} (100%) rename gfx/hud/{sb_nexball_carrying.tga => old/nexball_carrying.tga} (100%) rename gfx/hud/{ => old}/num_0.tga (100%) rename gfx/hud/{ => old}/num_0_stroke.tga (100%) rename gfx/hud/{ => old}/num_1.tga (100%) rename gfx/hud/{ => old}/num_1_stroke.tga (100%) rename gfx/hud/{ => old}/num_2.tga (100%) rename gfx/hud/{ => old}/num_2_stroke.tga (100%) rename gfx/hud/{ => old}/num_3.tga (100%) rename gfx/hud/{ => old}/num_3_stroke.tga (100%) rename gfx/hud/{ => old}/num_4.tga (100%) rename gfx/hud/{ => old}/num_4_stroke.tga (100%) rename gfx/hud/{ => old}/num_5.tga (100%) rename gfx/hud/{ => old}/num_5_stroke.tga (100%) rename gfx/hud/{ => old}/num_6.tga (100%) rename gfx/hud/{ => old}/num_6_stroke.tga (100%) rename gfx/hud/{ => old}/num_7.tga (100%) rename gfx/hud/{ => old}/num_7_stroke.tga (100%) rename gfx/hud/{ => old}/num_8.tga (100%) rename gfx/hud/{ => old}/num_8_stroke.tga (100%) rename gfx/hud/{ => old}/num_9.tga (100%) rename gfx/hud/{ => old}/num_9_stroke.tga (100%) rename gfx/hud/{ => old}/num_colon.tga (100%) rename gfx/hud/{ => old}/num_colon_stroke.tga (100%) rename gfx/hud/{ => old}/num_dot.tga (100%) rename gfx/hud/{ => old}/num_dot_stroke.tga (100%) rename gfx/hud/{ => old}/num_minus.tga (100%) rename gfx/hud/{ => old}/num_minus_stroke.tga (100%) rename gfx/hud/{ => old}/num_plus.tga (100%) rename gfx/hud/{ => old}/num_plus_stroke.tga (100%) rename gfx/hud/{race/newfail.tga => old/race_newfail.tga} (100%) rename gfx/hud/{race/newrankgreen.tga => old/race_newrankgreen.tga} (100%) rename gfx/hud/{race/newrankyellow.tga => old/race_newrankyellow.tga} (100%) rename gfx/hud/{race/newrecordserver.tga => old/race_newrecordserver.tga} (100%) rename gfx/hud/{race/newtime.tga => old/race_newtime.tga} (100%) rename gfx/hud/{ => old}/rifle_ring_1.tga (100%) rename gfx/hud/{ => old}/rifle_ring_2.tga (100%) rename gfx/hud/{ => old}/rifle_ring_3.tga (100%) rename gfx/hud/{ => old}/rifle_ring_4.tga (100%) rename gfx/hud/{ => old}/rifle_ring_5.tga (100%) rename gfx/hud/{ => old}/rifle_ring_6.tga (100%) rename gfx/hud/{ => old}/rifle_ring_7.tga (100%) rename gfx/hud/{ => old}/rifle_ring_8.tga (100%) rename gfx/hud/{sb_rocket.tga => old/rocket.tga} (100%) rename gfx/hud/{ => old}/sbar.tga (100%) rename gfx/hud/{sb_scoreboard_bg.tga => old/scoreboard_bg.tga} (100%) rename gfx/hud/{sb_scoreboard_tableheader.tga => old/scoreboard_tableheader.tga} (100%) rename gfx/hud/{sb_shells.tga => old/shells.tga} (100%) rename gfx/hud/{sb_shield.tga => old/shield.tga} (100%) rename gfx/hud/{ => old}/statusbar.tga (100%) rename gfx/hud/{sb_strength.tga => old/strength.tga} (100%) rename gfx/hud/{sb_timer.tga => old/timer.tga} (100%) rename gfx/hud/{sb_timerbg.tga => old/timerbg.tga} (100%) rename gfx/hud/{ => old}/voteprogress_back.tga (100%) rename gfx/hud/{ => old}/voteprogress_prog.tga (100%) rename gfx/hud/{ => old}/voteprogress_voted.tga (100%) rename gfx/hud/{inv_weapon0.tga => old/weapon0.tga} (100%) rename gfx/hud/{inv_weapon1.tga => old/weapon1.tga} (100%) rename gfx/hud/{inv_weapon10.tga => old/weapon10.tga} (100%) rename gfx/hud/{inv_weapon11.tga => old/weapon11.tga} (100%) rename gfx/hud/{inv_weapon12.tga => old/weapon12.tga} (100%) rename gfx/hud/{inv_weapon13.tga => old/weapon13.tga} (100%) rename gfx/hud/{inv_weapon14.tga => old/weapon14.tga} (100%) rename gfx/hud/{inv_weapon15.tga => old/weapon15.tga} (100%) rename gfx/hud/{inv_weapon2.tga => old/weapon2.tga} (100%) rename gfx/hud/{inv_weapon3.tga => old/weapon3.tga} (100%) rename gfx/hud/{inv_weapon4.tga => old/weapon4.tga} (100%) rename gfx/hud/{inv_weapon5.tga => old/weapon5.tga} (100%) rename gfx/hud/{inv_weapon6.tga => old/weapon6.tga} (100%) rename gfx/hud/{inv_weapon7.tga => old/weapon7.tga} (100%) rename gfx/hud/{inv_weapon8.tga => old/weapon8.tga} (100%) rename gfx/hud/{inv_weapon9.tga => old/weapon9.tga} (100%) rename gfx/hud/{inv_weapon_hlacmod_renameit.tga => old/weapon_hlacmod_renameit.tga} (100%) rename gfx/hud/{inv_weaponcampingrifle.tga => old/weaponcampingrifle.tga} (100%) rename gfx/hud/{inv_weaponcrylink.tga => old/weaponcrylink.tga} (100%) rename gfx/hud/{inv_weaponelectro.tga => old/weaponelectro.tga} (100%) rename gfx/hud/{inv_weaponfireball.tga => old/weaponfireball.tga} (100%) rename gfx/hud/{inv_weapongrenadelauncher.tga => old/weapongrenadelauncher.tga} (100%) rename gfx/hud/{inv_weaponhagar.tga => old/weaponhagar.tga} (100%) rename gfx/hud/{inv_weaponhlac.tga => old/weaponhlac.tga} (100%) rename gfx/hud/{inv_weaponhook.tga => old/weaponhook.tga} (100%) rename gfx/hud/{inv_weaponlaser.tga => old/weaponlaser.tga} (100%) rename gfx/hud/{inv_weaponminstanex.tga => old/weaponminstanex.tga} (100%) rename gfx/hud/{inv_weaponnex.tga => old/weaponnex.tga} (100%) rename gfx/hud/{inv_weaponporto.tga => old/weaponporto.tga} (100%) rename gfx/hud/{inv_weaponrocketlauncher.tga => old/weaponrocketlauncher.tga} (100%) rename gfx/hud/{inv_weaponseeker.tga => old/weaponseeker.tga} (100%) rename gfx/hud/{inv_weaponshotgun.tga => old/weaponshotgun.tga} (100%) rename gfx/hud/{inv_weapontuba.tga => old/weapontuba.tga} (100%) rename gfx/hud/{inv_weaponuzi.tga => old/weaponuzi.tga} (100%) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 51c44df7a..b2f1e466d 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1329,7 +1329,7 @@ con_notifyalign 0 // hud variables set _hud_configure 0 "1 = configure the HUD" -seta hud_skin default "skin folder where to look for images" +seta hud_skin old "skin folder where to look for images" seta hud_accuracy_yellow 40 "percentage at which the accuracy color is yellow" seta hud_progressbar_alpha "0.5" "alpha of progressbars" seta hud_bg 0 "sets the default background for the panels, file must exist in data/gfx/hud/. 0 = disable background by default" @@ -1341,7 +1341,7 @@ seta hud_fg_alpha 1 "alpha of the foreground" seta hud_configure_checkcollisions 1 "check for collisions against other panels when in hud configure mode" seta hud_configure_bg_minalpha 0.5 "minimum panel background alpha when in hud configure mode" -seta hud_dock dock_oldhud "overlay the whole screen with this dock background, 0 = disable" +seta hud_dock 1 "enable/disable a fullscreen background for the hud, useful for creating artificial docks" seta hud_dock_color "0 0.6 0.9" "dock color" seta hud_dock_alpha 0.8 "alpha of the dock" diff --git a/gfx/hud/sb_accuracy.tga b/gfx/hud/old/accuracy.tga similarity index 100% rename from gfx/hud/sb_accuracy.tga rename to gfx/hud/old/accuracy.tga diff --git a/gfx/hud/sb_accuracy_bar.tga b/gfx/hud/old/accuracy_bar.tga similarity index 100% rename from gfx/hud/sb_accuracy_bar.tga rename to gfx/hud/old/accuracy_bar.tga diff --git a/gfx/hud/sb_ammobg.tga b/gfx/hud/old/ammobg.tga similarity index 100% rename from gfx/hud/sb_ammobg.tga rename to gfx/hud/old/ammobg.tga diff --git a/gfx/hud/sb_armor.tga b/gfx/hud/old/armor.tga similarity index 100% rename from gfx/hud/sb_armor.tga rename to gfx/hud/old/armor.tga diff --git a/gfx/hud/border_oldhud.tga b/gfx/hud/old/border.tga similarity index 100% rename from gfx/hud/border_oldhud.tga rename to gfx/hud/old/border.tga diff --git a/gfx/hud/sb_bullets.tga b/gfx/hud/old/bullets.tga similarity index 100% rename from gfx/hud/sb_bullets.tga rename to gfx/hud/old/bullets.tga diff --git a/gfx/hud/sb_cells.tga b/gfx/hud/old/cells.tga similarity index 100% rename from gfx/hud/sb_cells.tga rename to gfx/hud/old/cells.tga diff --git a/gfx/hud/dock_oldhud.tga b/gfx/hud/old/dock.tga similarity index 100% rename from gfx/hud/dock_oldhud.tga rename to gfx/hud/old/dock.tga diff --git a/gfx/hud/sb_flag_blue_carrying.tga b/gfx/hud/old/flag_blue_carrying.tga similarity index 100% rename from gfx/hud/sb_flag_blue_carrying.tga rename to gfx/hud/old/flag_blue_carrying.tga diff --git a/gfx/hud/sb_flag_blue_lost.tga b/gfx/hud/old/flag_blue_lost.tga similarity index 100% rename from gfx/hud/sb_flag_blue_lost.tga rename to gfx/hud/old/flag_blue_lost.tga diff --git a/gfx/hud/sb_flag_blue_shielded.tga b/gfx/hud/old/flag_blue_shielded.tga similarity index 100% rename from gfx/hud/sb_flag_blue_shielded.tga rename to gfx/hud/old/flag_blue_shielded.tga diff --git a/gfx/hud/sb_flag_blue_taken.tga b/gfx/hud/old/flag_blue_taken.tga similarity index 100% rename from gfx/hud/sb_flag_blue_taken.tga rename to gfx/hud/old/flag_blue_taken.tga diff --git a/gfx/hud/sb_flag_red_carrying.tga b/gfx/hud/old/flag_red_carrying.tga similarity index 100% rename from gfx/hud/sb_flag_red_carrying.tga rename to gfx/hud/old/flag_red_carrying.tga diff --git a/gfx/hud/sb_flag_red_lost.tga b/gfx/hud/old/flag_red_lost.tga similarity index 100% rename from gfx/hud/sb_flag_red_lost.tga rename to gfx/hud/old/flag_red_lost.tga diff --git a/gfx/hud/sb_flag_red_shielded.tga b/gfx/hud/old/flag_red_shielded.tga similarity index 100% rename from gfx/hud/sb_flag_red_shielded.tga rename to gfx/hud/old/flag_red_shielded.tga diff --git a/gfx/hud/sb_flag_red_taken.tga b/gfx/hud/old/flag_red_taken.tga similarity index 100% rename from gfx/hud/sb_flag_red_taken.tga rename to gfx/hud/old/flag_red_taken.tga diff --git a/gfx/hud/sb_fuel.tga b/gfx/hud/old/fuel.tga similarity index 100% rename from gfx/hud/sb_fuel.tga rename to gfx/hud/old/fuel.tga diff --git a/gfx/hud/sb_health.tga b/gfx/hud/old/health.tga similarity index 100% rename from gfx/hud/sb_health.tga rename to gfx/hud/old/health.tga diff --git a/gfx/hud/sb_highlight_1.tga b/gfx/hud/old/highlight_1.tga similarity index 100% rename from gfx/hud/sb_highlight_1.tga rename to gfx/hud/old/highlight_1.tga diff --git a/gfx/hud/sb_highlight_2.tga b/gfx/hud/old/highlight_2.tga similarity index 100% rename from gfx/hud/sb_highlight_2.tga rename to gfx/hud/old/highlight_2.tga diff --git a/gfx/hud/sb_highlight_3.tga b/gfx/hud/old/highlight_3.tga similarity index 100% rename from gfx/hud/sb_highlight_3.tga rename to gfx/hud/old/highlight_3.tga diff --git a/gfx/hud/sb_highlight_4.tga b/gfx/hud/old/highlight_4.tga similarity index 100% rename from gfx/hud/sb_highlight_4.tga rename to gfx/hud/old/highlight_4.tga diff --git a/gfx/hud/keys/key_backward.tga b/gfx/hud/old/key_backward.tga similarity index 100% rename from gfx/hud/keys/key_backward.tga rename to gfx/hud/old/key_backward.tga diff --git a/gfx/hud/keys/key_backward_inv.tga b/gfx/hud/old/key_backward_inv.tga similarity index 100% rename from gfx/hud/keys/key_backward_inv.tga rename to gfx/hud/old/key_backward_inv.tga diff --git a/gfx/hud/keys/key_bg.tga b/gfx/hud/old/key_bg.tga similarity index 100% rename from gfx/hud/keys/key_bg.tga rename to gfx/hud/old/key_bg.tga diff --git a/gfx/hud/keys/key_crouch.tga b/gfx/hud/old/key_crouch.tga similarity index 100% rename from gfx/hud/keys/key_crouch.tga rename to gfx/hud/old/key_crouch.tga diff --git a/gfx/hud/keys/key_crouch_inv.tga b/gfx/hud/old/key_crouch_inv.tga similarity index 100% rename from gfx/hud/keys/key_crouch_inv.tga rename to gfx/hud/old/key_crouch_inv.tga diff --git a/gfx/hud/keys/key_forward.tga b/gfx/hud/old/key_forward.tga similarity index 100% rename from gfx/hud/keys/key_forward.tga rename to gfx/hud/old/key_forward.tga diff --git a/gfx/hud/keys/key_forward_inv.tga b/gfx/hud/old/key_forward_inv.tga similarity index 100% rename from gfx/hud/keys/key_forward_inv.tga rename to gfx/hud/old/key_forward_inv.tga diff --git a/gfx/hud/keys/key_jump.tga b/gfx/hud/old/key_jump.tga similarity index 100% rename from gfx/hud/keys/key_jump.tga rename to gfx/hud/old/key_jump.tga diff --git a/gfx/hud/keys/key_jump_inv.tga b/gfx/hud/old/key_jump_inv.tga similarity index 100% rename from gfx/hud/keys/key_jump_inv.tga rename to gfx/hud/old/key_jump_inv.tga diff --git a/gfx/hud/keys/key_left.tga b/gfx/hud/old/key_left.tga similarity index 100% rename from gfx/hud/keys/key_left.tga rename to gfx/hud/old/key_left.tga diff --git a/gfx/hud/keys/key_left_inv.tga b/gfx/hud/old/key_left_inv.tga similarity index 100% rename from gfx/hud/keys/key_left_inv.tga rename to gfx/hud/old/key_left_inv.tga diff --git a/gfx/hud/keys/key_right.tga b/gfx/hud/old/key_right.tga similarity index 100% rename from gfx/hud/keys/key_right.tga rename to gfx/hud/old/key_right.tga diff --git a/gfx/hud/keys/key_right_inv.tga b/gfx/hud/old/key_right_inv.tga similarity index 100% rename from gfx/hud/keys/key_right_inv.tga rename to gfx/hud/old/key_right_inv.tga diff --git a/gfx/hud/sb_kh_blue.tga b/gfx/hud/old/kh_blue.tga similarity index 100% rename from gfx/hud/sb_kh_blue.tga rename to gfx/hud/old/kh_blue.tga diff --git a/gfx/hud/sb_kh_bluearrow.tga b/gfx/hud/old/kh_bluearrow.tga similarity index 100% rename from gfx/hud/sb_kh_bluearrow.tga rename to gfx/hud/old/kh_bluearrow.tga diff --git a/gfx/hud/sb_kh_pink.tga b/gfx/hud/old/kh_pink.tga similarity index 100% rename from gfx/hud/sb_kh_pink.tga rename to gfx/hud/old/kh_pink.tga diff --git a/gfx/hud/sb_kh_pinkarrow.tga b/gfx/hud/old/kh_pinkarrow.tga similarity index 100% rename from gfx/hud/sb_kh_pinkarrow.tga rename to gfx/hud/old/kh_pinkarrow.tga diff --git a/gfx/hud/sb_kh_red.tga b/gfx/hud/old/kh_red.tga similarity index 100% rename from gfx/hud/sb_kh_red.tga rename to gfx/hud/old/kh_red.tga diff --git a/gfx/hud/sb_kh_redarrow.tga b/gfx/hud/old/kh_redarrow.tga similarity index 100% rename from gfx/hud/sb_kh_redarrow.tga rename to gfx/hud/old/kh_redarrow.tga diff --git a/gfx/hud/sb_kh_yellow.tga b/gfx/hud/old/kh_yellow.tga similarity index 100% rename from gfx/hud/sb_kh_yellow.tga rename to gfx/hud/old/kh_yellow.tga diff --git a/gfx/hud/sb_kh_yellowarrow.tga b/gfx/hud/old/kh_yellowarrow.tga similarity index 100% rename from gfx/hud/sb_kh_yellowarrow.tga rename to gfx/hud/old/kh_yellowarrow.tga diff --git a/gfx/hud/sb_nexball_carrying.tga b/gfx/hud/old/nexball_carrying.tga similarity index 100% rename from gfx/hud/sb_nexball_carrying.tga rename to gfx/hud/old/nexball_carrying.tga diff --git a/gfx/hud/num_0.tga b/gfx/hud/old/num_0.tga similarity index 100% rename from gfx/hud/num_0.tga rename to gfx/hud/old/num_0.tga diff --git a/gfx/hud/num_0_stroke.tga b/gfx/hud/old/num_0_stroke.tga similarity index 100% rename from gfx/hud/num_0_stroke.tga rename to gfx/hud/old/num_0_stroke.tga diff --git a/gfx/hud/num_1.tga b/gfx/hud/old/num_1.tga similarity index 100% rename from gfx/hud/num_1.tga rename to gfx/hud/old/num_1.tga diff --git a/gfx/hud/num_1_stroke.tga b/gfx/hud/old/num_1_stroke.tga similarity index 100% rename from gfx/hud/num_1_stroke.tga rename to gfx/hud/old/num_1_stroke.tga diff --git a/gfx/hud/num_2.tga b/gfx/hud/old/num_2.tga similarity index 100% rename from gfx/hud/num_2.tga rename to gfx/hud/old/num_2.tga diff --git a/gfx/hud/num_2_stroke.tga b/gfx/hud/old/num_2_stroke.tga similarity index 100% rename from gfx/hud/num_2_stroke.tga rename to gfx/hud/old/num_2_stroke.tga diff --git a/gfx/hud/num_3.tga b/gfx/hud/old/num_3.tga similarity index 100% rename from gfx/hud/num_3.tga rename to gfx/hud/old/num_3.tga diff --git a/gfx/hud/num_3_stroke.tga b/gfx/hud/old/num_3_stroke.tga similarity index 100% rename from gfx/hud/num_3_stroke.tga rename to gfx/hud/old/num_3_stroke.tga diff --git a/gfx/hud/num_4.tga b/gfx/hud/old/num_4.tga similarity index 100% rename from gfx/hud/num_4.tga rename to gfx/hud/old/num_4.tga diff --git a/gfx/hud/num_4_stroke.tga b/gfx/hud/old/num_4_stroke.tga similarity index 100% rename from gfx/hud/num_4_stroke.tga rename to gfx/hud/old/num_4_stroke.tga diff --git a/gfx/hud/num_5.tga b/gfx/hud/old/num_5.tga similarity index 100% rename from gfx/hud/num_5.tga rename to gfx/hud/old/num_5.tga diff --git a/gfx/hud/num_5_stroke.tga b/gfx/hud/old/num_5_stroke.tga similarity index 100% rename from gfx/hud/num_5_stroke.tga rename to gfx/hud/old/num_5_stroke.tga diff --git a/gfx/hud/num_6.tga b/gfx/hud/old/num_6.tga similarity index 100% rename from gfx/hud/num_6.tga rename to gfx/hud/old/num_6.tga diff --git a/gfx/hud/num_6_stroke.tga b/gfx/hud/old/num_6_stroke.tga similarity index 100% rename from gfx/hud/num_6_stroke.tga rename to gfx/hud/old/num_6_stroke.tga diff --git a/gfx/hud/num_7.tga b/gfx/hud/old/num_7.tga similarity index 100% rename from gfx/hud/num_7.tga rename to gfx/hud/old/num_7.tga diff --git a/gfx/hud/num_7_stroke.tga b/gfx/hud/old/num_7_stroke.tga similarity index 100% rename from gfx/hud/num_7_stroke.tga rename to gfx/hud/old/num_7_stroke.tga diff --git a/gfx/hud/num_8.tga b/gfx/hud/old/num_8.tga similarity index 100% rename from gfx/hud/num_8.tga rename to gfx/hud/old/num_8.tga diff --git a/gfx/hud/num_8_stroke.tga b/gfx/hud/old/num_8_stroke.tga similarity index 100% rename from gfx/hud/num_8_stroke.tga rename to gfx/hud/old/num_8_stroke.tga diff --git a/gfx/hud/num_9.tga b/gfx/hud/old/num_9.tga similarity index 100% rename from gfx/hud/num_9.tga rename to gfx/hud/old/num_9.tga diff --git a/gfx/hud/num_9_stroke.tga b/gfx/hud/old/num_9_stroke.tga similarity index 100% rename from gfx/hud/num_9_stroke.tga rename to gfx/hud/old/num_9_stroke.tga diff --git a/gfx/hud/num_colon.tga b/gfx/hud/old/num_colon.tga similarity index 100% rename from gfx/hud/num_colon.tga rename to gfx/hud/old/num_colon.tga diff --git a/gfx/hud/num_colon_stroke.tga b/gfx/hud/old/num_colon_stroke.tga similarity index 100% rename from gfx/hud/num_colon_stroke.tga rename to gfx/hud/old/num_colon_stroke.tga diff --git a/gfx/hud/num_dot.tga b/gfx/hud/old/num_dot.tga similarity index 100% rename from gfx/hud/num_dot.tga rename to gfx/hud/old/num_dot.tga diff --git a/gfx/hud/num_dot_stroke.tga b/gfx/hud/old/num_dot_stroke.tga similarity index 100% rename from gfx/hud/num_dot_stroke.tga rename to gfx/hud/old/num_dot_stroke.tga diff --git a/gfx/hud/num_minus.tga b/gfx/hud/old/num_minus.tga similarity index 100% rename from gfx/hud/num_minus.tga rename to gfx/hud/old/num_minus.tga diff --git a/gfx/hud/num_minus_stroke.tga b/gfx/hud/old/num_minus_stroke.tga similarity index 100% rename from gfx/hud/num_minus_stroke.tga rename to gfx/hud/old/num_minus_stroke.tga diff --git a/gfx/hud/num_plus.tga b/gfx/hud/old/num_plus.tga similarity index 100% rename from gfx/hud/num_plus.tga rename to gfx/hud/old/num_plus.tga diff --git a/gfx/hud/num_plus_stroke.tga b/gfx/hud/old/num_plus_stroke.tga similarity index 100% rename from gfx/hud/num_plus_stroke.tga rename to gfx/hud/old/num_plus_stroke.tga diff --git a/gfx/hud/race/newfail.tga b/gfx/hud/old/race_newfail.tga similarity index 100% rename from gfx/hud/race/newfail.tga rename to gfx/hud/old/race_newfail.tga diff --git a/gfx/hud/race/newrankgreen.tga b/gfx/hud/old/race_newrankgreen.tga similarity index 100% rename from gfx/hud/race/newrankgreen.tga rename to gfx/hud/old/race_newrankgreen.tga diff --git a/gfx/hud/race/newrankyellow.tga b/gfx/hud/old/race_newrankyellow.tga similarity index 100% rename from gfx/hud/race/newrankyellow.tga rename to gfx/hud/old/race_newrankyellow.tga diff --git a/gfx/hud/race/newrecordserver.tga b/gfx/hud/old/race_newrecordserver.tga similarity index 100% rename from gfx/hud/race/newrecordserver.tga rename to gfx/hud/old/race_newrecordserver.tga diff --git a/gfx/hud/race/newtime.tga b/gfx/hud/old/race_newtime.tga similarity index 100% rename from gfx/hud/race/newtime.tga rename to gfx/hud/old/race_newtime.tga diff --git a/gfx/hud/rifle_ring_1.tga b/gfx/hud/old/rifle_ring_1.tga similarity index 100% rename from gfx/hud/rifle_ring_1.tga rename to gfx/hud/old/rifle_ring_1.tga diff --git a/gfx/hud/rifle_ring_2.tga b/gfx/hud/old/rifle_ring_2.tga similarity index 100% rename from gfx/hud/rifle_ring_2.tga rename to gfx/hud/old/rifle_ring_2.tga diff --git a/gfx/hud/rifle_ring_3.tga b/gfx/hud/old/rifle_ring_3.tga similarity index 100% rename from gfx/hud/rifle_ring_3.tga rename to gfx/hud/old/rifle_ring_3.tga diff --git a/gfx/hud/rifle_ring_4.tga b/gfx/hud/old/rifle_ring_4.tga similarity index 100% rename from gfx/hud/rifle_ring_4.tga rename to gfx/hud/old/rifle_ring_4.tga diff --git a/gfx/hud/rifle_ring_5.tga b/gfx/hud/old/rifle_ring_5.tga similarity index 100% rename from gfx/hud/rifle_ring_5.tga rename to gfx/hud/old/rifle_ring_5.tga diff --git a/gfx/hud/rifle_ring_6.tga b/gfx/hud/old/rifle_ring_6.tga similarity index 100% rename from gfx/hud/rifle_ring_6.tga rename to gfx/hud/old/rifle_ring_6.tga diff --git a/gfx/hud/rifle_ring_7.tga b/gfx/hud/old/rifle_ring_7.tga similarity index 100% rename from gfx/hud/rifle_ring_7.tga rename to gfx/hud/old/rifle_ring_7.tga diff --git a/gfx/hud/rifle_ring_8.tga b/gfx/hud/old/rifle_ring_8.tga similarity index 100% rename from gfx/hud/rifle_ring_8.tga rename to gfx/hud/old/rifle_ring_8.tga diff --git a/gfx/hud/sb_rocket.tga b/gfx/hud/old/rocket.tga similarity index 100% rename from gfx/hud/sb_rocket.tga rename to gfx/hud/old/rocket.tga diff --git a/gfx/hud/sbar.tga b/gfx/hud/old/sbar.tga similarity index 100% rename from gfx/hud/sbar.tga rename to gfx/hud/old/sbar.tga diff --git a/gfx/hud/sb_scoreboard_bg.tga b/gfx/hud/old/scoreboard_bg.tga similarity index 100% rename from gfx/hud/sb_scoreboard_bg.tga rename to gfx/hud/old/scoreboard_bg.tga diff --git a/gfx/hud/sb_scoreboard_tableheader.tga b/gfx/hud/old/scoreboard_tableheader.tga similarity index 100% rename from gfx/hud/sb_scoreboard_tableheader.tga rename to gfx/hud/old/scoreboard_tableheader.tga diff --git a/gfx/hud/sb_shells.tga b/gfx/hud/old/shells.tga similarity index 100% rename from gfx/hud/sb_shells.tga rename to gfx/hud/old/shells.tga diff --git a/gfx/hud/sb_shield.tga b/gfx/hud/old/shield.tga similarity index 100% rename from gfx/hud/sb_shield.tga rename to gfx/hud/old/shield.tga diff --git a/gfx/hud/statusbar.tga b/gfx/hud/old/statusbar.tga similarity index 100% rename from gfx/hud/statusbar.tga rename to gfx/hud/old/statusbar.tga diff --git a/gfx/hud/sb_strength.tga b/gfx/hud/old/strength.tga similarity index 100% rename from gfx/hud/sb_strength.tga rename to gfx/hud/old/strength.tga diff --git a/gfx/hud/sb_timer.tga b/gfx/hud/old/timer.tga similarity index 100% rename from gfx/hud/sb_timer.tga rename to gfx/hud/old/timer.tga diff --git a/gfx/hud/sb_timerbg.tga b/gfx/hud/old/timerbg.tga similarity index 100% rename from gfx/hud/sb_timerbg.tga rename to gfx/hud/old/timerbg.tga diff --git a/gfx/hud/voteprogress_back.tga b/gfx/hud/old/voteprogress_back.tga similarity index 100% rename from gfx/hud/voteprogress_back.tga rename to gfx/hud/old/voteprogress_back.tga diff --git a/gfx/hud/voteprogress_prog.tga b/gfx/hud/old/voteprogress_prog.tga similarity index 100% rename from gfx/hud/voteprogress_prog.tga rename to gfx/hud/old/voteprogress_prog.tga diff --git a/gfx/hud/voteprogress_voted.tga b/gfx/hud/old/voteprogress_voted.tga similarity index 100% rename from gfx/hud/voteprogress_voted.tga rename to gfx/hud/old/voteprogress_voted.tga diff --git a/gfx/hud/inv_weapon0.tga b/gfx/hud/old/weapon0.tga similarity index 100% rename from gfx/hud/inv_weapon0.tga rename to gfx/hud/old/weapon0.tga diff --git a/gfx/hud/inv_weapon1.tga b/gfx/hud/old/weapon1.tga similarity index 100% rename from gfx/hud/inv_weapon1.tga rename to gfx/hud/old/weapon1.tga diff --git a/gfx/hud/inv_weapon10.tga b/gfx/hud/old/weapon10.tga similarity index 100% rename from gfx/hud/inv_weapon10.tga rename to gfx/hud/old/weapon10.tga diff --git a/gfx/hud/inv_weapon11.tga b/gfx/hud/old/weapon11.tga similarity index 100% rename from gfx/hud/inv_weapon11.tga rename to gfx/hud/old/weapon11.tga diff --git a/gfx/hud/inv_weapon12.tga b/gfx/hud/old/weapon12.tga similarity index 100% rename from gfx/hud/inv_weapon12.tga rename to gfx/hud/old/weapon12.tga diff --git a/gfx/hud/inv_weapon13.tga b/gfx/hud/old/weapon13.tga similarity index 100% rename from gfx/hud/inv_weapon13.tga rename to gfx/hud/old/weapon13.tga diff --git a/gfx/hud/inv_weapon14.tga b/gfx/hud/old/weapon14.tga similarity index 100% rename from gfx/hud/inv_weapon14.tga rename to gfx/hud/old/weapon14.tga diff --git a/gfx/hud/inv_weapon15.tga b/gfx/hud/old/weapon15.tga similarity index 100% rename from gfx/hud/inv_weapon15.tga rename to gfx/hud/old/weapon15.tga diff --git a/gfx/hud/inv_weapon2.tga b/gfx/hud/old/weapon2.tga similarity index 100% rename from gfx/hud/inv_weapon2.tga rename to gfx/hud/old/weapon2.tga diff --git a/gfx/hud/inv_weapon3.tga b/gfx/hud/old/weapon3.tga similarity index 100% rename from gfx/hud/inv_weapon3.tga rename to gfx/hud/old/weapon3.tga diff --git a/gfx/hud/inv_weapon4.tga b/gfx/hud/old/weapon4.tga similarity index 100% rename from gfx/hud/inv_weapon4.tga rename to gfx/hud/old/weapon4.tga diff --git a/gfx/hud/inv_weapon5.tga b/gfx/hud/old/weapon5.tga similarity index 100% rename from gfx/hud/inv_weapon5.tga rename to gfx/hud/old/weapon5.tga diff --git a/gfx/hud/inv_weapon6.tga b/gfx/hud/old/weapon6.tga similarity index 100% rename from gfx/hud/inv_weapon6.tga rename to gfx/hud/old/weapon6.tga diff --git a/gfx/hud/inv_weapon7.tga b/gfx/hud/old/weapon7.tga similarity index 100% rename from gfx/hud/inv_weapon7.tga rename to gfx/hud/old/weapon7.tga diff --git a/gfx/hud/inv_weapon8.tga b/gfx/hud/old/weapon8.tga similarity index 100% rename from gfx/hud/inv_weapon8.tga rename to gfx/hud/old/weapon8.tga diff --git a/gfx/hud/inv_weapon9.tga b/gfx/hud/old/weapon9.tga similarity index 100% rename from gfx/hud/inv_weapon9.tga rename to gfx/hud/old/weapon9.tga diff --git a/gfx/hud/inv_weapon_hlacmod_renameit.tga b/gfx/hud/old/weapon_hlacmod_renameit.tga similarity index 100% rename from gfx/hud/inv_weapon_hlacmod_renameit.tga rename to gfx/hud/old/weapon_hlacmod_renameit.tga diff --git a/gfx/hud/inv_weaponcampingrifle.tga b/gfx/hud/old/weaponcampingrifle.tga similarity index 100% rename from gfx/hud/inv_weaponcampingrifle.tga rename to gfx/hud/old/weaponcampingrifle.tga diff --git a/gfx/hud/inv_weaponcrylink.tga b/gfx/hud/old/weaponcrylink.tga similarity index 100% rename from gfx/hud/inv_weaponcrylink.tga rename to gfx/hud/old/weaponcrylink.tga diff --git a/gfx/hud/inv_weaponelectro.tga b/gfx/hud/old/weaponelectro.tga similarity index 100% rename from gfx/hud/inv_weaponelectro.tga rename to gfx/hud/old/weaponelectro.tga diff --git a/gfx/hud/inv_weaponfireball.tga b/gfx/hud/old/weaponfireball.tga similarity index 100% rename from gfx/hud/inv_weaponfireball.tga rename to gfx/hud/old/weaponfireball.tga diff --git a/gfx/hud/inv_weapongrenadelauncher.tga b/gfx/hud/old/weapongrenadelauncher.tga similarity index 100% rename from gfx/hud/inv_weapongrenadelauncher.tga rename to gfx/hud/old/weapongrenadelauncher.tga diff --git a/gfx/hud/inv_weaponhagar.tga b/gfx/hud/old/weaponhagar.tga similarity index 100% rename from gfx/hud/inv_weaponhagar.tga rename to gfx/hud/old/weaponhagar.tga diff --git a/gfx/hud/inv_weaponhlac.tga b/gfx/hud/old/weaponhlac.tga similarity index 100% rename from gfx/hud/inv_weaponhlac.tga rename to gfx/hud/old/weaponhlac.tga diff --git a/gfx/hud/inv_weaponhook.tga b/gfx/hud/old/weaponhook.tga similarity index 100% rename from gfx/hud/inv_weaponhook.tga rename to gfx/hud/old/weaponhook.tga diff --git a/gfx/hud/inv_weaponlaser.tga b/gfx/hud/old/weaponlaser.tga similarity index 100% rename from gfx/hud/inv_weaponlaser.tga rename to gfx/hud/old/weaponlaser.tga diff --git a/gfx/hud/inv_weaponminstanex.tga b/gfx/hud/old/weaponminstanex.tga similarity index 100% rename from gfx/hud/inv_weaponminstanex.tga rename to gfx/hud/old/weaponminstanex.tga diff --git a/gfx/hud/inv_weaponnex.tga b/gfx/hud/old/weaponnex.tga similarity index 100% rename from gfx/hud/inv_weaponnex.tga rename to gfx/hud/old/weaponnex.tga diff --git a/gfx/hud/inv_weaponporto.tga b/gfx/hud/old/weaponporto.tga similarity index 100% rename from gfx/hud/inv_weaponporto.tga rename to gfx/hud/old/weaponporto.tga diff --git a/gfx/hud/inv_weaponrocketlauncher.tga b/gfx/hud/old/weaponrocketlauncher.tga similarity index 100% rename from gfx/hud/inv_weaponrocketlauncher.tga rename to gfx/hud/old/weaponrocketlauncher.tga diff --git a/gfx/hud/inv_weaponseeker.tga b/gfx/hud/old/weaponseeker.tga similarity index 100% rename from gfx/hud/inv_weaponseeker.tga rename to gfx/hud/old/weaponseeker.tga diff --git a/gfx/hud/inv_weaponshotgun.tga b/gfx/hud/old/weaponshotgun.tga similarity index 100% rename from gfx/hud/inv_weaponshotgun.tga rename to gfx/hud/old/weaponshotgun.tga diff --git a/gfx/hud/inv_weapontuba.tga b/gfx/hud/old/weapontuba.tga similarity index 100% rename from gfx/hud/inv_weapontuba.tga rename to gfx/hud/old/weapontuba.tga diff --git a/gfx/hud/inv_weaponuzi.tga b/gfx/hud/old/weaponuzi.tga similarity index 100% rename from gfx/hud/inv_weaponuzi.tga rename to gfx/hud/old/weaponuzi.tga diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 70ee6a757..e50776bda 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -77,7 +77,7 @@ void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector the // draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga void drawpic_skin(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) { - drawpic_skin(pos, strcat("gfx/hud/", hud_skin, "/", pic), sz, color, alpha, drawflag); + drawpic(pos, strcat("gfx/hud/", hud_skin, "/", pic), sz, color, alpha, drawflag); } // return HUD background color @@ -177,7 +177,7 @@ void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float le hl_pos_y = pos_y - lettersize/20; hl_pos_z = 0; - drawpic_skin(hl_pos, strcat("sb_highlight_", l_length), hl_size, '1 1 1', alpha, dflags); + drawpic_skin(hl_pos, strcat("highlight_", l_length), hl_size, '1 1 1', alpha, dflags); } if (stroke == 1) @@ -1146,8 +1146,8 @@ void HUD_WeaponIcons() weapon_damage = weapon_fired[self.weapon-WEP_FIRST]; if(self.weapon == activeweapon) - drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "sb_ammobg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("inv_weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "ammobg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * hud_alpha_fg, DRAWFLAG_NORMAL); if(cvar_or("hud_weaponicons_number", 1)) drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), ftos(id), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); @@ -1160,7 +1160,7 @@ void HUD_WeaponIcons() accuracy_color = HUD_AccuracyColor(weapon_stats); if(weapon_damage) - drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) - '2 0 0' + eY * (mySize_y/rows - accuracybar_height), "sb_accuracy_bar.tga", eX * mySize_x*(1/columns) + eY * accuracybar_height, accuracy_color, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) - '2 0 0' + eY * (mySize_y/rows - accuracybar_height), "accuracy_bar.tga", eX * mySize_x*(1/columns) + eY * accuracybar_height, accuracy_color, hud_alpha_fg, DRAWFLAG_NORMAL); } } @@ -1207,11 +1207,11 @@ string GetAmmoPicture(float i) { switch(i) { - case 0: return "sb_shells"; - case 1: return "sb_bullets"; - case 2: return "sb_rocket"; - case 3: return "sb_cells"; - case 4: return "sb_fuel"; + case 0: return "shells"; + case 1: return "bullets"; + case 2: return "rocket"; + case 3: return "cells"; + case 4: return "fuel"; default: return ""; } } @@ -1237,7 +1237,7 @@ void HUD_Inventory() if(cvar("hud_inventory_onlycurrent")) { if (stat_items & GetAmmoItemCode(i)) { - drawpic_skin(pos, "sb_ammobg", mySize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos, "ammobg", mySize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); drawpic_skin(pos + eY * 0.05 * mySize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); if(a < 10) HUD_DrawXNum(pos + eX * 0.8 * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); @@ -1276,7 +1276,7 @@ void HUD_Inventory() } if (stat_items & GetAmmoItemCode(i)) - drawpic_skin(mypos, "sb_ammobg", mysize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(mypos, "ammobg", mysize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); drawpic_skin(mypos + eY * 0.05 * mysize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mysize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); if (a < 10) { if(stat_items & GetAmmoItemCode(i)) @@ -1356,14 +1356,14 @@ void HUD_Powerups() { len = strlen(ftos(leftcnt)); drawpic_skin(pos, "statusbar", eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos, strcat("sb_", leftname), '1 1 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos, strcat("", leftname), '1 1 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * mySize_y + eY * 0.25 * mySize_y, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } if(rightcnt) { drawpic_skin(pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/30), "statusbar", eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * mySize_y, strcat("sb_", rightname), '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * mySize_y, strcat("", rightname), '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * mySize_x - eX * 2.5 * mySize_y + eY * 0.25 * mySize_y, rightcnt, 3, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } } @@ -1374,7 +1374,7 @@ void HUD_Powerups() { len = strlen(ftos(leftcnt)); drawpic_skin(pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/30), "statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30), HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.4 * mySize_y, strcat("sb_", leftname), '0.7 0.7 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * 0.4 * mySize_y, strcat("", leftname), '0.7 0.7 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * ((3-len)/2) * 0.5 * mySize_y + eY * 0.55 * mySize_y, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } @@ -1383,7 +1383,7 @@ void HUD_Powerups() { len = strlen(ftos(rightcnt)); drawpic_skin(pos + eX * 0.5 * mySize_x + eY * mySize_y - eY * mySize_y * min(1, rightcnt/30), "statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30), HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * 1.1 * mySize_y, strcat("sb_", rightname), '0.7 0.7 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * 1.1 * mySize_y, strcat("", rightname), '0.7 0.7 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * mySize_x - eX * len * 0.5 * mySize_y - eX * ((3-len)/2) * 0.5 * mySize_y + eY * 0.55 * mySize_y, rightcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } } @@ -1394,7 +1394,7 @@ void HUD_Powerups() { len = strlen(ftos(leftcnt)); drawpic_skin(pos, "statusbar", eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos, strcat("sb_", leftname), '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos, strcat("", leftname), '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * 0.5 * mySize_y, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } @@ -1403,7 +1403,7 @@ void HUD_Powerups() { len = strlen(ftos(rightcnt)); drawpic_skin(pos + eY * 0.5 * mySize_y, "statusbar", eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eY * 0.5 * mySize_y, strcat("sb_", rightname), '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eY * 0.5 * mySize_y, strcat("", rightname), '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * 0.5 * mySize_y + eY * 0.5 * mySize_y, rightcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } } @@ -1416,18 +1416,18 @@ void HUD_Powerups() { { if(dt < 5) { - drawpic_expanding_two(pos, "sb_str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, + drawpic_expanding_two(pos, "str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, bound(0, (ceil(dt) - dt) / 0.5, 1)); } else { - drawpic_skin(pos, "sb_str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE); + drawpic_skin(pos, "str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE); } HUD_DrawXNum(pos - '40 -2 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } else if(dt > -1) { - drawpic_expanding(pos, "sb_str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, + drawpic_expanding(pos, "str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, bound(0, -dt / 0.5, 1)); } } @@ -1439,18 +1439,18 @@ void HUD_Powerups() { { if(dt < 5) { - drawpic_expanding_two(pos - '0 -22 0', "sb_invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, + drawpic_expanding_two(pos - '0 -22 0', "invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, bound(0, (ceil(dt) - dt) / 0.5, 1)); } else { - drawpic_skin(pos - '0 -22 0', "sb_invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE); + drawpic_skin(pos - '0 -22 0', "invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE); } HUD_DrawXNum(pos - '40 -24 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } else if(dt > -1) { - drawpic_expanding(pos - '0 -22 0', "sb_invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, + drawpic_expanding(pos - '0 -22 0', "invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, bound(0, -dt / 0.5, 1)); } } @@ -1495,13 +1495,13 @@ void HUD_HealthArmor(void) if(v_z) // fully armored { // here, armorideal > armor - drawpic_skin(num_pos + '78 -4.5 0', "sb_health", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(num_pos + '108 -4.5 0', "sb_armor", '20 20 0', '1 1 1', hud_alpha_fg * armor / v_y, DRAWFLAG_NORMAL); + drawpic_skin(num_pos + '78 -4.5 0', "health", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(num_pos + '108 -4.5 0', "armor", '20 20 0', '1 1 1', hud_alpha_fg * armor / v_y, DRAWFLAG_NORMAL); } else { - drawpic_skin(num_pos + '108 -4.5 0', "sb_health", '20 20 0', '1 1 1', hud_alpha_fg * v_y / armor, DRAWFLAG_NORMAL); - drawpic_skin(num_pos + '78 -4.5 0', "sb_armor", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(num_pos + '108 -4.5 0', "health", '20 20 0', '1 1 1', hud_alpha_fg * v_y / armor, DRAWFLAG_NORMAL); + drawpic_skin(num_pos + '78 -4.5 0', "armor", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); } HUD_DrawXNum_Colored(num_pos, x, 3, 24, hud_alpha_fg); // draw the combined health and armor } @@ -1547,14 +1547,14 @@ void HUD_HealthArmor(void) len = strlen(ftos(leftcnt)); drawpic_skin(pos, "statusbar", eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos, strcat("sb_", leftname), '1 1 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos, strcat("", leftname), '1 1 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum_Colored(pos + eX * mySize_y + eY * 0.25 * mySize_y, leftcnt, len, 0.5 * mySize_y, hud_alpha_fg); } if(rightactive) { drawpic_skin(pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/200), "statusbar", eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * mySize_y, strcat("sb_", rightname), '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * mySize_y, strcat("", rightname), '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * 2.5 * mySize_y + eY * 0.25 * mySize_y, rightcnt, 3, 0.5 * mySize_y, hud_alpha_fg); } @@ -1568,7 +1568,7 @@ void HUD_HealthArmor(void) len = strlen(ftos(leftcnt)); drawpic_skin(pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200), "statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200), HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.4 * mySize_y, strcat("sb_", leftname), '0.7 0.7 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * 0.4 * mySize_y, strcat("", leftname), '0.7 0.7 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum_Colored(pos + eX * ((3-len)/2) * 0.5 * mySize_y + eY * 0.55 * mySize_y, leftcnt, len, 0.5 * mySize_y, hud_alpha_fg); } @@ -1577,7 +1577,7 @@ void HUD_HealthArmor(void) len = strlen(ftos(rightcnt)); drawpic_skin(pos + eX * 0.5 * mySize_x + eY * mySize_y - eY * mySize_y * min(1, rightcnt/200), "statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200), HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * 1.1 * mySize_y, strcat("sb_", rightname), '0.7 0.7 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * 1.1 * mySize_y, strcat("", rightname), '0.7 0.7 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * len * 0.5 * mySize_y - eX * ((3-len)/2) * 0.5 * mySize_y + eY * 0.55 * mySize_y, rightcnt, len, 0.5 * mySize_y, hud_alpha_fg); } @@ -1591,7 +1591,7 @@ void HUD_HealthArmor(void) len = strlen(ftos(leftcnt)); drawpic_skin(pos, "statusbar", eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos, strcat("sb_", leftname), '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos, strcat("", leftname), '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum_Colored(pos + eX * 0.5 * mySize_y, leftcnt, len, 0.5 * mySize_y, hud_alpha_fg); } @@ -1600,7 +1600,7 @@ void HUD_HealthArmor(void) len = strlen(ftos(rightcnt)); drawpic_skin(pos + eY * 0.5 * mySize_y, "statusbar", eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eY * 0.5 * mySize_y, strcat("sb_", rightname), '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eY * 0.5 * mySize_y, strcat("", rightname), '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum_Colored(pos + eX * 0.5 * mySize_y + eY * 0.5 * mySize_y, rightcnt, len, 0.5 * mySize_y, hud_alpha_fg); } @@ -1659,7 +1659,7 @@ void HUD_Score() HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y, distribution, 3, 3, 0.33 * mySize_y, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); if (leader) - drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("sb_highlight_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("highlight_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } else { // teamgames float max_fragcount; @@ -1683,13 +1683,13 @@ void HUD_Score() if (max_fragcount == score) leader = 1; if (leader) - drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("sb_highlight_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("highlight_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } else { if (max_fragcount == score) leader = 1; if (leader) - drawpic_skin(pos + eX * mySize_x - eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y * teamnum, strcat("sb_highlight_", ftos(score_len)), eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y * teamnum, strcat("highlight_", ftos(score_len)), eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y + eY * 0.33 * mySize_y * teamnum, score, 3, 0, 0.33 * mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); teamnum += 1; } @@ -2054,20 +2054,20 @@ void HUD_DrawRaceStatus(vector pos) rankname = race_PlaceName(rank); if(race_status == 0) - drawpic_skin(pos, "race/newfail", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newfail", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); else if(race_status == 1) { - drawpic_skin(pos, "race/newtime", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newtime", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', hud_alpha_fg * a, DRAWFLAG_NORMAL); drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); } else if(race_status == 2) { if(race_status_name == GetPlayerName(player_localentnum -1) || !race_myrank || race_myrank < rank) - drawpic_skin(pos, "race/newrankgreen", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newrankgreen", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); else - drawpic_skin(pos, "race/newrankyellow", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newrankyellow", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', hud_alpha_fg * a, DRAWFLAG_NORMAL); drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); } else if(race_status == 3) { - drawpic_skin(pos, "race/newrecordserver", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newrecordserver", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', hud_alpha_fg * a, DRAWFLAG_NORMAL); drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); } @@ -2140,25 +2140,25 @@ void CSQC_ctf_hud(void) float red_alpha, red_alpha_prevstatus; red_alpha = red_alpha_prevstatus = 1; switch(redflag) { - case 1: red_icon = "sb_flag_red_taken"; break; - case 2: red_icon = "sb_flag_red_lost"; break; - case 3: red_icon = "sb_flag_red_carrying"; red_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; + case 1: red_icon = "flag_red_taken"; break; + case 2: red_icon = "flag_red_lost"; break; + case 3: red_icon = "flag_red_carrying"; red_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; default: if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2)) - red_icon = "sb_flag_red_shielded"; + red_icon = "flag_red_shielded"; else red_icon = string_null; break; } switch(redflag_prevstatus) { - case 1: red_icon_prevstatus = "sb_flag_red_taken"; break; - case 2: red_icon_prevstatus = "sb_flag_red_lost"; break; - case 3: red_icon_prevstatus = "sb_flag_red_carrying"; red_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; + case 1: red_icon_prevstatus = "flag_red_taken"; break; + case 2: red_icon_prevstatus = "flag_red_lost"; break; + case 3: red_icon_prevstatus = "flag_red_carrying"; red_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; default: if(redflag == 3) - red_icon_prevstatus = "sb_flag_red_carrying"; // make it more visible + red_icon_prevstatus = "flag_red_carrying"; // make it more visible else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2)) - red_icon_prevstatus = "sb_flag_red_shielded"; + red_icon_prevstatus = "flag_red_shielded"; else red_icon_prevstatus = string_null; break; @@ -2168,25 +2168,25 @@ void CSQC_ctf_hud(void) float blue_alpha, blue_alpha_prevstatus; blue_alpha = blue_alpha_prevstatus = 1; switch(blueflag) { - case 1: blue_icon = "sb_flag_blue_taken"; break; - case 2: blue_icon = "sb_flag_blue_lost"; break; - case 3: blue_icon = "sb_flag_blue_carrying"; blue_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; + case 1: blue_icon = "flag_blue_taken"; break; + case 2: blue_icon = "flag_blue_lost"; break; + case 3: blue_icon = "flag_blue_carrying"; blue_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; default: if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1)) - blue_icon = "sb_flag_blue_shielded"; + blue_icon = "flag_blue_shielded"; else blue_icon = string_null; break; } switch(blueflag_prevstatus) { - case 1: blue_icon_prevstatus = "sb_flag_blue_taken"; break; - case 2: blue_icon_prevstatus = "sb_flag_blue_lost"; break; - case 3: blue_icon_prevstatus = "sb_flag_blue_carrying"; blue_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; + case 1: blue_icon_prevstatus = "flag_blue_taken"; break; + case 2: blue_icon_prevstatus = "flag_blue_lost"; break; + case 3: blue_icon_prevstatus = "flag_blue_carrying"; blue_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; default: if(blueflag == 3) - blue_icon_prevstatus = "sb_flag_blue_carrying"; // make it more visible + blue_icon_prevstatus = "flag_blue_carrying"; // make it more visible else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1)) - blue_icon_prevstatus = "sb_flag_blue_shielded"; + blue_icon_prevstatus = "flag_blue_shielded"; else blue_icon_prevstatus = string_null; break; @@ -2260,7 +2260,7 @@ void CSQC_ctf_hud(void) } // race record display if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead - drawpic_skin(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "sb_highlight_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "highlight_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); @@ -2347,16 +2347,16 @@ void CSQC_kh_hud(void) switch(keyteam) { case COLOR_TEAM1: - drawpic (pa, "sb_kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (pa, "kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; case COLOR_TEAM2: - drawpic (pa, "sb_kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (pa, "kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; case COLOR_TEAM3: - drawpic (pa, "sb_kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (pa, "kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; case COLOR_TEAM4: - drawpic (pa, "sb_kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (pa, "kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; default: break; @@ -2364,16 +2364,16 @@ void CSQC_kh_hud(void) switch(i) // YAY! switch(i) inside a for loop for i. DailyWTF, here we come! { case 0: - drawpic (p, "sb_kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (p, "kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; case 1: - drawpic (p, "sb_kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (p, "kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; case 2: - drawpic (p, "sb_kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (p, "kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; case 3: - drawpic (p, "sb_kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (p, "kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; } } @@ -2430,7 +2430,7 @@ void CSQC_nb_hud(void) pos_y += 2; //vertical margin to the picture if (stat_items & IT_KEY1) - drawpic_skin(pos, "sb_nexball_carrying", '80 34 0', '1 1 1', 1, DRAWFLAG_NORMAL); + drawpic_skin(pos, "nexball_carrying", '80 34 0', '1 1 1', 1, DRAWFLAG_NORMAL); } // Race/CTS HUD modicon section @@ -2559,7 +2559,7 @@ void HUD_Timer() minutes = min(minutes, 999); if(minutesLeft >= 1 || cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) { if(minutes < 100) - drawpic_skin(pos + eX * mySize_x - eX * 5.1 * mySize_y, "sb_timer", '1 1 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * 5.1 * mySize_y, "timer", '1 1 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * mySize_x - eX * 5.1 * mySize_y, minutes, 3, 0, mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); drawpic_skin(pos + eX * mySize_x - eX * 2.57 * mySize_y, "num_colon", '1 1 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL); } @@ -2572,7 +2572,7 @@ void HUD_Timer() minutes = min(minutes, 99); if(minutesLeft >= 1 || cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) { if(minutes < 100) - drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.5 * 0.5 * mySize_y, "sb_timer", '0.5 0.5 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.5 * 0.5 * mySize_y, "timer", '0.5 0.5 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * 0.5 * mySize_x - eX * mySize_y + eY * 0.5 * mySize_y, minutes, -2, 0, 0.5 * mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.5 * 0.5 * mySize_y + eY * 0.5 * mySize_y, "num_colon", '0.5 0.5 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL); } @@ -2880,8 +2880,8 @@ void HUD_Main (void) hud_skin = cvar_string("hud_skin"); // Drawing stuff - if(cvar_string("hud_dock") != "0") - drawpic_skin('0 0 0', strcat("", cvar_string("hud_dock")), eX * vid_conwidth + eY * vid_conheight, stov(cvar_string("hud_dock_color")), cvar("hud_dock_alpha"), DRAWFLAG_NORMAL); + if(cvar("hud_dock")) + drawpic_skin('0 0 0', "dock", eX * vid_conwidth + eY * vid_conheight, stov(cvar_string("hud_dock_color")), cvar("hud_dock_alpha"), DRAWFLAG_NORMAL); if(HUD_Panel_CheckActive(0)) HUD_WeaponIcons(); -- 2.39.2