Merge branch 'fruitiex/newpanelhud' of ssh://git.xonotic.org/xonotic-data.pk3dir...
authorFruitieX <rasse@rasse-lappy.localdomain>
Fri, 14 May 2010 15:39:25 +0000 (18:39 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Fri, 14 May 2010 15:39:25 +0000 (18:39 +0300)
269 files changed:
defaultXonotic.cfg
gfx/hud/border_oldhud.tga [deleted file]
gfx/hud/dock_oldhud.tga [deleted file]
gfx/hud/inv_weapon0.tga [deleted file]
gfx/hud/inv_weapon1.tga [deleted file]
gfx/hud/inv_weapon10.tga [deleted file]
gfx/hud/inv_weapon11.tga [deleted file]
gfx/hud/inv_weapon12.tga [deleted file]
gfx/hud/inv_weapon13.tga [deleted file]
gfx/hud/inv_weapon14.tga [deleted file]
gfx/hud/inv_weapon15.tga [deleted file]
gfx/hud/inv_weapon2.tga [deleted file]
gfx/hud/inv_weapon3.tga [deleted file]
gfx/hud/inv_weapon4.tga [deleted file]
gfx/hud/inv_weapon5.tga [deleted file]
gfx/hud/inv_weapon6.tga [deleted file]
gfx/hud/inv_weapon7.tga [deleted file]
gfx/hud/inv_weapon8.tga [deleted file]
gfx/hud/inv_weapon9.tga [deleted file]
gfx/hud/inv_weapon_hlacmod_renameit.tga [deleted file]
gfx/hud/inv_weaponcampingrifle.tga [deleted file]
gfx/hud/inv_weaponcrylink.tga [deleted file]
gfx/hud/inv_weaponelectro.tga [deleted file]
gfx/hud/inv_weaponfireball.tga [deleted file]
gfx/hud/inv_weapongrenadelauncher.tga [deleted file]
gfx/hud/inv_weaponhagar.tga [deleted file]
gfx/hud/inv_weaponhlac.tga [deleted file]
gfx/hud/inv_weaponhook.tga [deleted file]
gfx/hud/inv_weaponlaser.tga [deleted file]
gfx/hud/inv_weaponminstanex.tga [deleted file]
gfx/hud/inv_weaponnex.tga [deleted file]
gfx/hud/inv_weaponporto.tga [deleted file]
gfx/hud/inv_weaponrocketlauncher.tga [deleted file]
gfx/hud/inv_weaponseeker.tga [deleted file]
gfx/hud/inv_weaponshotgun.tga [deleted file]
gfx/hud/inv_weapontuba.tga [deleted file]
gfx/hud/inv_weaponuzi.tga [deleted file]
gfx/hud/keys/key_backward.tga [deleted file]
gfx/hud/keys/key_backward_inv.tga [deleted file]
gfx/hud/keys/key_bg.tga [deleted file]
gfx/hud/keys/key_crouch.tga [deleted file]
gfx/hud/keys/key_crouch_inv.tga [deleted file]
gfx/hud/keys/key_forward.tga [deleted file]
gfx/hud/keys/key_forward_inv.tga [deleted file]
gfx/hud/keys/key_jump.tga [deleted file]
gfx/hud/keys/key_jump_inv.tga [deleted file]
gfx/hud/keys/key_left.tga [deleted file]
gfx/hud/keys/key_left_inv.tga [deleted file]
gfx/hud/keys/key_right.tga [deleted file]
gfx/hud/keys/key_right_inv.tga [deleted file]
gfx/hud/num_0.tga [deleted file]
gfx/hud/num_0_stroke.tga [deleted file]
gfx/hud/num_1.tga [deleted file]
gfx/hud/num_1_stroke.tga [deleted file]
gfx/hud/num_2.tga [deleted file]
gfx/hud/num_2_stroke.tga [deleted file]
gfx/hud/num_3.tga [deleted file]
gfx/hud/num_3_stroke.tga [deleted file]
gfx/hud/num_4.tga [deleted file]
gfx/hud/num_4_stroke.tga [deleted file]
gfx/hud/num_5.tga [deleted file]
gfx/hud/num_5_stroke.tga [deleted file]
gfx/hud/num_6.tga [deleted file]
gfx/hud/num_6_stroke.tga [deleted file]
gfx/hud/num_7.tga [deleted file]
gfx/hud/num_7_stroke.tga [deleted file]
gfx/hud/num_8.tga [deleted file]
gfx/hud/num_8_stroke.tga [deleted file]
gfx/hud/num_9.tga [deleted file]
gfx/hud/num_9_stroke.tga [deleted file]
gfx/hud/num_colon.tga [deleted file]
gfx/hud/num_colon_stroke.tga [deleted file]
gfx/hud/num_dot.tga [deleted file]
gfx/hud/num_dot_stroke.tga [deleted file]
gfx/hud/num_minus.tga [deleted file]
gfx/hud/num_minus_stroke.tga [deleted file]
gfx/hud/num_plus.tga [deleted file]
gfx/hud/num_plus_stroke.tga [deleted file]
gfx/hud/old/accuracy.tga [new file with mode: 0644]
gfx/hud/old/accuracy_bar.tga [new file with mode: 0644]
gfx/hud/old/ammobg.tga [new file with mode: 0644]
gfx/hud/old/armor.tga [new file with mode: 0644]
gfx/hud/old/border.tga [new file with mode: 0644]
gfx/hud/old/bullets.tga [new file with mode: 0644]
gfx/hud/old/cells.tga [new file with mode: 0644]
gfx/hud/old/dock.tga [new file with mode: 0644]
gfx/hud/old/flag_blue_carrying.tga [new file with mode: 0644]
gfx/hud/old/flag_blue_lost.tga [new file with mode: 0644]
gfx/hud/old/flag_blue_shielded.tga [new file with mode: 0644]
gfx/hud/old/flag_blue_taken.tga [new file with mode: 0644]
gfx/hud/old/flag_red_carrying.tga [new file with mode: 0644]
gfx/hud/old/flag_red_lost.tga [new file with mode: 0644]
gfx/hud/old/flag_red_shielded.tga [new file with mode: 0644]
gfx/hud/old/flag_red_taken.tga [new file with mode: 0644]
gfx/hud/old/fuel.tga [new file with mode: 0644]
gfx/hud/old/health.tga [new file with mode: 0644]
gfx/hud/old/highlight_1.tga [new file with mode: 0644]
gfx/hud/old/highlight_2.tga [new file with mode: 0644]
gfx/hud/old/highlight_3.tga [new file with mode: 0644]
gfx/hud/old/highlight_4.tga [new file with mode: 0644]
gfx/hud/old/key_backward.tga [new file with mode: 0644]
gfx/hud/old/key_backward_inv.tga [new file with mode: 0644]
gfx/hud/old/key_bg.tga [new file with mode: 0644]
gfx/hud/old/key_crouch.tga [new file with mode: 0644]
gfx/hud/old/key_crouch_inv.tga [new file with mode: 0644]
gfx/hud/old/key_forward.tga [new file with mode: 0644]
gfx/hud/old/key_forward_inv.tga [new file with mode: 0644]
gfx/hud/old/key_jump.tga [new file with mode: 0644]
gfx/hud/old/key_jump_inv.tga [new file with mode: 0644]
gfx/hud/old/key_left.tga [new file with mode: 0644]
gfx/hud/old/key_left_inv.tga [new file with mode: 0644]
gfx/hud/old/key_right.tga [new file with mode: 0644]
gfx/hud/old/key_right_inv.tga [new file with mode: 0644]
gfx/hud/old/kh_blue.tga [new file with mode: 0644]
gfx/hud/old/kh_bluearrow.tga [new file with mode: 0644]
gfx/hud/old/kh_pink.tga [new file with mode: 0644]
gfx/hud/old/kh_pinkarrow.tga [new file with mode: 0644]
gfx/hud/old/kh_red.tga [new file with mode: 0644]
gfx/hud/old/kh_redarrow.tga [new file with mode: 0644]
gfx/hud/old/kh_yellow.tga [new file with mode: 0644]
gfx/hud/old/kh_yellowarrow.tga [new file with mode: 0644]
gfx/hud/old/nexball_carrying.tga [new file with mode: 0644]
gfx/hud/old/num_0.tga [new file with mode: 0644]
gfx/hud/old/num_0_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_1.tga [new file with mode: 0644]
gfx/hud/old/num_1_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_2.tga [new file with mode: 0644]
gfx/hud/old/num_2_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_3.tga [new file with mode: 0644]
gfx/hud/old/num_3_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_4.tga [new file with mode: 0644]
gfx/hud/old/num_4_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_5.tga [new file with mode: 0644]
gfx/hud/old/num_5_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_6.tga [new file with mode: 0644]
gfx/hud/old/num_6_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_7.tga [new file with mode: 0644]
gfx/hud/old/num_7_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_8.tga [new file with mode: 0644]
gfx/hud/old/num_8_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_9.tga [new file with mode: 0644]
gfx/hud/old/num_9_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_colon.tga [new file with mode: 0644]
gfx/hud/old/num_colon_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_dot.tga [new file with mode: 0644]
gfx/hud/old/num_dot_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_minus.tga [new file with mode: 0644]
gfx/hud/old/num_minus_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_plus.tga [new file with mode: 0644]
gfx/hud/old/num_plus_stroke.tga [new file with mode: 0644]
gfx/hud/old/race_newfail.tga [new file with mode: 0644]
gfx/hud/old/race_newrankgreen.tga [new file with mode: 0644]
gfx/hud/old/race_newrankyellow.tga [new file with mode: 0644]
gfx/hud/old/race_newrecordserver.tga [new file with mode: 0644]
gfx/hud/old/race_newtime.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_1.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_2.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_3.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_4.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_5.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_6.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_7.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_8.tga [new file with mode: 0644]
gfx/hud/old/rocket.tga [new file with mode: 0644]
gfx/hud/old/sbar.tga [new file with mode: 0644]
gfx/hud/old/scoreboard_bg.tga [new file with mode: 0644]
gfx/hud/old/scoreboard_tableheader.tga [new file with mode: 0644]
gfx/hud/old/shells.tga [new file with mode: 0644]
gfx/hud/old/shield.tga [new file with mode: 0644]
gfx/hud/old/statusbar.tga [new file with mode: 0644]
gfx/hud/old/strength.tga [new file with mode: 0644]
gfx/hud/old/timer.tga [new file with mode: 0644]
gfx/hud/old/timerbg.tga [new file with mode: 0644]
gfx/hud/old/voteprogress_back.tga [new file with mode: 0644]
gfx/hud/old/voteprogress_prog.tga [new file with mode: 0644]
gfx/hud/old/voteprogress_voted.tga [new file with mode: 0644]
gfx/hud/old/weapon0.tga [new file with mode: 0644]
gfx/hud/old/weapon1.tga [new file with mode: 0644]
gfx/hud/old/weapon10.tga [new file with mode: 0644]
gfx/hud/old/weapon11.tga [new file with mode: 0644]
gfx/hud/old/weapon12.tga [new file with mode: 0644]
gfx/hud/old/weapon13.tga [new file with mode: 0644]
gfx/hud/old/weapon14.tga [new file with mode: 0644]
gfx/hud/old/weapon15.tga [new file with mode: 0644]
gfx/hud/old/weapon2.tga [new file with mode: 0644]
gfx/hud/old/weapon3.tga [new file with mode: 0644]
gfx/hud/old/weapon4.tga [new file with mode: 0644]
gfx/hud/old/weapon5.tga [new file with mode: 0644]
gfx/hud/old/weapon6.tga [new file with mode: 0644]
gfx/hud/old/weapon7.tga [new file with mode: 0644]
gfx/hud/old/weapon8.tga [new file with mode: 0644]
gfx/hud/old/weapon9.tga [new file with mode: 0644]
gfx/hud/old/weapon_hlacmod_renameit.tga [new file with mode: 0644]
gfx/hud/old/weaponcampingrifle.tga [new file with mode: 0644]
gfx/hud/old/weaponcrylink.tga [new file with mode: 0644]
gfx/hud/old/weaponelectro.tga [new file with mode: 0644]
gfx/hud/old/weaponfireball.tga [new file with mode: 0644]
gfx/hud/old/weapongrenadelauncher.tga [new file with mode: 0644]
gfx/hud/old/weaponhagar.tga [new file with mode: 0644]
gfx/hud/old/weaponhlac.tga [new file with mode: 0644]
gfx/hud/old/weaponhook.tga [new file with mode: 0644]
gfx/hud/old/weaponlaser.tga [new file with mode: 0644]
gfx/hud/old/weaponminstanex.tga [new file with mode: 0644]
gfx/hud/old/weaponnex.tga [new file with mode: 0644]
gfx/hud/old/weaponporto.tga [new file with mode: 0644]
gfx/hud/old/weaponrocketlauncher.tga [new file with mode: 0644]
gfx/hud/old/weaponseeker.tga [new file with mode: 0644]
gfx/hud/old/weaponshotgun.tga [new file with mode: 0644]
gfx/hud/old/weapontuba.tga [new file with mode: 0644]
gfx/hud/old/weaponuzi.tga [new file with mode: 0644]
gfx/hud/race/newfail.tga [deleted file]
gfx/hud/race/newrankgreen.tga [deleted file]
gfx/hud/race/newrankyellow.tga [deleted file]
gfx/hud/race/newrecordserver.tga [deleted file]
gfx/hud/race/newtime.tga [deleted file]
gfx/hud/rifle_ring_1.tga [deleted file]
gfx/hud/rifle_ring_2.tga [deleted file]
gfx/hud/rifle_ring_3.tga [deleted file]
gfx/hud/rifle_ring_4.tga [deleted file]
gfx/hud/rifle_ring_5.tga [deleted file]
gfx/hud/rifle_ring_6.tga [deleted file]
gfx/hud/rifle_ring_7.tga [deleted file]
gfx/hud/rifle_ring_8.tga [deleted file]
gfx/hud/sb_accuracy.tga [deleted file]
gfx/hud/sb_accuracy_bar.tga [deleted file]
gfx/hud/sb_ammobg.tga [deleted file]
gfx/hud/sb_armor.tga [deleted file]
gfx/hud/sb_bullets.tga [deleted file]
gfx/hud/sb_cells.tga [deleted file]
gfx/hud/sb_flag_blue_carrying.tga [deleted file]
gfx/hud/sb_flag_blue_lost.tga [deleted file]
gfx/hud/sb_flag_blue_shielded.tga [deleted file]
gfx/hud/sb_flag_blue_taken.tga [deleted file]
gfx/hud/sb_flag_red_carrying.tga [deleted file]
gfx/hud/sb_flag_red_lost.tga [deleted file]
gfx/hud/sb_flag_red_shielded.tga [deleted file]
gfx/hud/sb_flag_red_taken.tga [deleted file]
gfx/hud/sb_fuel.tga [deleted file]
gfx/hud/sb_health.tga [deleted file]
gfx/hud/sb_highlight_1.tga [deleted file]
gfx/hud/sb_highlight_2.tga [deleted file]
gfx/hud/sb_highlight_3.tga [deleted file]
gfx/hud/sb_highlight_4.tga [deleted file]
gfx/hud/sb_kh_blue.tga [deleted file]
gfx/hud/sb_kh_bluearrow.tga [deleted file]
gfx/hud/sb_kh_pink.tga [deleted file]
gfx/hud/sb_kh_pinkarrow.tga [deleted file]
gfx/hud/sb_kh_red.tga [deleted file]
gfx/hud/sb_kh_redarrow.tga [deleted file]
gfx/hud/sb_kh_yellow.tga [deleted file]
gfx/hud/sb_kh_yellowarrow.tga [deleted file]
gfx/hud/sb_nexball_carrying.tga [deleted file]
gfx/hud/sb_rocket.tga [deleted file]
gfx/hud/sb_scoreboard_bg.tga [deleted file]
gfx/hud/sb_scoreboard_tableheader.tga [deleted file]
gfx/hud/sb_shells.tga [deleted file]
gfx/hud/sb_shield.tga [deleted file]
gfx/hud/sb_strength.tga [deleted file]
gfx/hud/sb_timer.tga [deleted file]
gfx/hud/sb_timerbg.tga [deleted file]
gfx/hud/sbar.tga [deleted file]
gfx/hud/statusbar.tga [deleted file]
gfx/hud/voteprogress_back.tga [deleted file]
gfx/hud/voteprogress_prog.tga [deleted file]
gfx/hud/voteprogress_voted.tga [deleted file]
qcsrc/client/Main.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/common/constants.qh

index a08fe16e2b6f8c2fd8a6f640aa6e9aba939d89dd..b2f1e466de596f3956e69abb92fa6a04394ecd8b 100644 (file)
@@ -1328,6 +1328,8 @@ con_notifyalign 0
 
 // hud variables
 set _hud_configure 0 "1 = configure the HUD"
+
+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"
@@ -1339,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/border_oldhud.tga b/gfx/hud/border_oldhud.tga
deleted file mode 100644 (file)
index a3056c9..0000000
Binary files a/gfx/hud/border_oldhud.tga and /dev/null differ
diff --git a/gfx/hud/dock_oldhud.tga b/gfx/hud/dock_oldhud.tga
deleted file mode 100644 (file)
index 2b28659..0000000
Binary files a/gfx/hud/dock_oldhud.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon0.tga b/gfx/hud/inv_weapon0.tga
deleted file mode 100644 (file)
index b66500b..0000000
Binary files a/gfx/hud/inv_weapon0.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon1.tga b/gfx/hud/inv_weapon1.tga
deleted file mode 100644 (file)
index 32f8e20..0000000
Binary files a/gfx/hud/inv_weapon1.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon10.tga b/gfx/hud/inv_weapon10.tga
deleted file mode 100644 (file)
index ae18113..0000000
Binary files a/gfx/hud/inv_weapon10.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon11.tga b/gfx/hud/inv_weapon11.tga
deleted file mode 100644 (file)
index a1f662e..0000000
Binary files a/gfx/hud/inv_weapon11.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon12.tga b/gfx/hud/inv_weapon12.tga
deleted file mode 100644 (file)
index b63c2d8..0000000
Binary files a/gfx/hud/inv_weapon12.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon13.tga b/gfx/hud/inv_weapon13.tga
deleted file mode 100644 (file)
index 0a8cf7e..0000000
Binary files a/gfx/hud/inv_weapon13.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon14.tga b/gfx/hud/inv_weapon14.tga
deleted file mode 100644 (file)
index 09da559..0000000
Binary files a/gfx/hud/inv_weapon14.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon15.tga b/gfx/hud/inv_weapon15.tga
deleted file mode 100644 (file)
index 0a8cf7e..0000000
Binary files a/gfx/hud/inv_weapon15.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon2.tga b/gfx/hud/inv_weapon2.tga
deleted file mode 100644 (file)
index 72ce481..0000000
Binary files a/gfx/hud/inv_weapon2.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon3.tga b/gfx/hud/inv_weapon3.tga
deleted file mode 100644 (file)
index 91a8ce4..0000000
Binary files a/gfx/hud/inv_weapon3.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon4.tga b/gfx/hud/inv_weapon4.tga
deleted file mode 100644 (file)
index b800f0a..0000000
Binary files a/gfx/hud/inv_weapon4.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon5.tga b/gfx/hud/inv_weapon5.tga
deleted file mode 100644 (file)
index 1a92967..0000000
Binary files a/gfx/hud/inv_weapon5.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon6.tga b/gfx/hud/inv_weapon6.tga
deleted file mode 100644 (file)
index 7523580..0000000
Binary files a/gfx/hud/inv_weapon6.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon7.tga b/gfx/hud/inv_weapon7.tga
deleted file mode 100644 (file)
index 3803159..0000000
Binary files a/gfx/hud/inv_weapon7.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon8.tga b/gfx/hud/inv_weapon8.tga
deleted file mode 100644 (file)
index bca989f..0000000
Binary files a/gfx/hud/inv_weapon8.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon9.tga b/gfx/hud/inv_weapon9.tga
deleted file mode 100644 (file)
index 444247f..0000000
Binary files a/gfx/hud/inv_weapon9.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon_hlacmod_renameit.tga b/gfx/hud/inv_weapon_hlacmod_renameit.tga
deleted file mode 100644 (file)
index 503dad9..0000000
Binary files a/gfx/hud/inv_weapon_hlacmod_renameit.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponcampingrifle.tga b/gfx/hud/inv_weaponcampingrifle.tga
deleted file mode 100644 (file)
index 09da559..0000000
Binary files a/gfx/hud/inv_weaponcampingrifle.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponcrylink.tga b/gfx/hud/inv_weaponcrylink.tga
deleted file mode 100644 (file)
index 1a92967..0000000
Binary files a/gfx/hud/inv_weaponcrylink.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponelectro.tga b/gfx/hud/inv_weaponelectro.tga
deleted file mode 100644 (file)
index b800f0a..0000000
Binary files a/gfx/hud/inv_weaponelectro.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponfireball.tga b/gfx/hud/inv_weaponfireball.tga
deleted file mode 100644 (file)
index b90d687..0000000
Binary files a/gfx/hud/inv_weaponfireball.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapongrenadelauncher.tga b/gfx/hud/inv_weapongrenadelauncher.tga
deleted file mode 100644 (file)
index 91a8ce4..0000000
Binary files a/gfx/hud/inv_weapongrenadelauncher.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponhagar.tga b/gfx/hud/inv_weaponhagar.tga
deleted file mode 100644 (file)
index 3803159..0000000
Binary files a/gfx/hud/inv_weaponhagar.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponhlac.tga b/gfx/hud/inv_weaponhlac.tga
deleted file mode 100644 (file)
index b63c2d8..0000000
Binary files a/gfx/hud/inv_weaponhlac.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponhook.tga b/gfx/hud/inv_weaponhook.tga
deleted file mode 100644 (file)
index a1f662e..0000000
Binary files a/gfx/hud/inv_weaponhook.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponlaser.tga b/gfx/hud/inv_weaponlaser.tga
deleted file mode 100644 (file)
index b66500b..0000000
Binary files a/gfx/hud/inv_weaponlaser.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponminstanex.tga b/gfx/hud/inv_weaponminstanex.tga
deleted file mode 100644 (file)
index ae18113..0000000
Binary files a/gfx/hud/inv_weaponminstanex.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponnex.tga b/gfx/hud/inv_weaponnex.tga
deleted file mode 100644 (file)
index 7523580..0000000
Binary files a/gfx/hud/inv_weaponnex.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponporto.tga b/gfx/hud/inv_weaponporto.tga
deleted file mode 100644 (file)
index 444247f..0000000
Binary files a/gfx/hud/inv_weaponporto.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponrocketlauncher.tga b/gfx/hud/inv_weaponrocketlauncher.tga
deleted file mode 100644 (file)
index bca989f..0000000
Binary files a/gfx/hud/inv_weaponrocketlauncher.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponseeker.tga b/gfx/hud/inv_weaponseeker.tga
deleted file mode 100644 (file)
index 0a8cf7e..0000000
Binary files a/gfx/hud/inv_weaponseeker.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponshotgun.tga b/gfx/hud/inv_weaponshotgun.tga
deleted file mode 100644 (file)
index 32f8e20..0000000
Binary files a/gfx/hud/inv_weaponshotgun.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapontuba.tga b/gfx/hud/inv_weapontuba.tga
deleted file mode 100644 (file)
index ba59aca..0000000
Binary files a/gfx/hud/inv_weapontuba.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponuzi.tga b/gfx/hud/inv_weaponuzi.tga
deleted file mode 100644 (file)
index 72ce481..0000000
Binary files a/gfx/hud/inv_weaponuzi.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_backward.tga b/gfx/hud/keys/key_backward.tga
deleted file mode 100644 (file)
index 4de0f33..0000000
Binary files a/gfx/hud/keys/key_backward.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_backward_inv.tga b/gfx/hud/keys/key_backward_inv.tga
deleted file mode 100644 (file)
index bef0d1c..0000000
Binary files a/gfx/hud/keys/key_backward_inv.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_bg.tga b/gfx/hud/keys/key_bg.tga
deleted file mode 100644 (file)
index fca30be..0000000
Binary files a/gfx/hud/keys/key_bg.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_crouch.tga b/gfx/hud/keys/key_crouch.tga
deleted file mode 100644 (file)
index 00b2dfe..0000000
Binary files a/gfx/hud/keys/key_crouch.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_crouch_inv.tga b/gfx/hud/keys/key_crouch_inv.tga
deleted file mode 100644 (file)
index 2cdbda8..0000000
Binary files a/gfx/hud/keys/key_crouch_inv.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_forward.tga b/gfx/hud/keys/key_forward.tga
deleted file mode 100644 (file)
index dfe2233..0000000
Binary files a/gfx/hud/keys/key_forward.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_forward_inv.tga b/gfx/hud/keys/key_forward_inv.tga
deleted file mode 100644 (file)
index 7bbea60..0000000
Binary files a/gfx/hud/keys/key_forward_inv.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_jump.tga b/gfx/hud/keys/key_jump.tga
deleted file mode 100644 (file)
index d02b2db..0000000
Binary files a/gfx/hud/keys/key_jump.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_jump_inv.tga b/gfx/hud/keys/key_jump_inv.tga
deleted file mode 100644 (file)
index c54bb37..0000000
Binary files a/gfx/hud/keys/key_jump_inv.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_left.tga b/gfx/hud/keys/key_left.tga
deleted file mode 100644 (file)
index 60fe71f..0000000
Binary files a/gfx/hud/keys/key_left.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_left_inv.tga b/gfx/hud/keys/key_left_inv.tga
deleted file mode 100644 (file)
index 92bc615..0000000
Binary files a/gfx/hud/keys/key_left_inv.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_right.tga b/gfx/hud/keys/key_right.tga
deleted file mode 100644 (file)
index 308c03b..0000000
Binary files a/gfx/hud/keys/key_right.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_right_inv.tga b/gfx/hud/keys/key_right_inv.tga
deleted file mode 100644 (file)
index 8f04be4..0000000
Binary files a/gfx/hud/keys/key_right_inv.tga and /dev/null differ
diff --git a/gfx/hud/num_0.tga b/gfx/hud/num_0.tga
deleted file mode 100644 (file)
index f0ab2f1..0000000
Binary files a/gfx/hud/num_0.tga and /dev/null differ
diff --git a/gfx/hud/num_0_stroke.tga b/gfx/hud/num_0_stroke.tga
deleted file mode 100644 (file)
index e9c6e5b..0000000
Binary files a/gfx/hud/num_0_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_1.tga b/gfx/hud/num_1.tga
deleted file mode 100644 (file)
index 78f1f45..0000000
Binary files a/gfx/hud/num_1.tga and /dev/null differ
diff --git a/gfx/hud/num_1_stroke.tga b/gfx/hud/num_1_stroke.tga
deleted file mode 100644 (file)
index 1ff552f..0000000
Binary files a/gfx/hud/num_1_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_2.tga b/gfx/hud/num_2.tga
deleted file mode 100644 (file)
index 205dd03..0000000
Binary files a/gfx/hud/num_2.tga and /dev/null differ
diff --git a/gfx/hud/num_2_stroke.tga b/gfx/hud/num_2_stroke.tga
deleted file mode 100644 (file)
index 08d26df..0000000
Binary files a/gfx/hud/num_2_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_3.tga b/gfx/hud/num_3.tga
deleted file mode 100644 (file)
index 335b5da..0000000
Binary files a/gfx/hud/num_3.tga and /dev/null differ
diff --git a/gfx/hud/num_3_stroke.tga b/gfx/hud/num_3_stroke.tga
deleted file mode 100644 (file)
index a5fddda..0000000
Binary files a/gfx/hud/num_3_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_4.tga b/gfx/hud/num_4.tga
deleted file mode 100644 (file)
index 2b9f46f..0000000
Binary files a/gfx/hud/num_4.tga and /dev/null differ
diff --git a/gfx/hud/num_4_stroke.tga b/gfx/hud/num_4_stroke.tga
deleted file mode 100644 (file)
index fe87933..0000000
Binary files a/gfx/hud/num_4_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_5.tga b/gfx/hud/num_5.tga
deleted file mode 100644 (file)
index 8bb7043..0000000
Binary files a/gfx/hud/num_5.tga and /dev/null differ
diff --git a/gfx/hud/num_5_stroke.tga b/gfx/hud/num_5_stroke.tga
deleted file mode 100644 (file)
index 3a6978a..0000000
Binary files a/gfx/hud/num_5_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_6.tga b/gfx/hud/num_6.tga
deleted file mode 100644 (file)
index 1db8c0e..0000000
Binary files a/gfx/hud/num_6.tga and /dev/null differ
diff --git a/gfx/hud/num_6_stroke.tga b/gfx/hud/num_6_stroke.tga
deleted file mode 100644 (file)
index f64e178..0000000
Binary files a/gfx/hud/num_6_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_7.tga b/gfx/hud/num_7.tga
deleted file mode 100644 (file)
index 0099d68..0000000
Binary files a/gfx/hud/num_7.tga and /dev/null differ
diff --git a/gfx/hud/num_7_stroke.tga b/gfx/hud/num_7_stroke.tga
deleted file mode 100644 (file)
index 252e796..0000000
Binary files a/gfx/hud/num_7_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_8.tga b/gfx/hud/num_8.tga
deleted file mode 100644 (file)
index aa20157..0000000
Binary files a/gfx/hud/num_8.tga and /dev/null differ
diff --git a/gfx/hud/num_8_stroke.tga b/gfx/hud/num_8_stroke.tga
deleted file mode 100644 (file)
index e2cd39d..0000000
Binary files a/gfx/hud/num_8_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_9.tga b/gfx/hud/num_9.tga
deleted file mode 100644 (file)
index 87b9c21..0000000
Binary files a/gfx/hud/num_9.tga and /dev/null differ
diff --git a/gfx/hud/num_9_stroke.tga b/gfx/hud/num_9_stroke.tga
deleted file mode 100644 (file)
index 5a8d610..0000000
Binary files a/gfx/hud/num_9_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_colon.tga b/gfx/hud/num_colon.tga
deleted file mode 100644 (file)
index e22c09a..0000000
Binary files a/gfx/hud/num_colon.tga and /dev/null differ
diff --git a/gfx/hud/num_colon_stroke.tga b/gfx/hud/num_colon_stroke.tga
deleted file mode 100644 (file)
index 68ad28a..0000000
Binary files a/gfx/hud/num_colon_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_dot.tga b/gfx/hud/num_dot.tga
deleted file mode 100644 (file)
index 7fbfdd0..0000000
Binary files a/gfx/hud/num_dot.tga and /dev/null differ
diff --git a/gfx/hud/num_dot_stroke.tga b/gfx/hud/num_dot_stroke.tga
deleted file mode 100644 (file)
index 29ad696..0000000
Binary files a/gfx/hud/num_dot_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_minus.tga b/gfx/hud/num_minus.tga
deleted file mode 100644 (file)
index 10721f2..0000000
Binary files a/gfx/hud/num_minus.tga and /dev/null differ
diff --git a/gfx/hud/num_minus_stroke.tga b/gfx/hud/num_minus_stroke.tga
deleted file mode 100644 (file)
index 26455a0..0000000
Binary files a/gfx/hud/num_minus_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_plus.tga b/gfx/hud/num_plus.tga
deleted file mode 100644 (file)
index 3cb17b3..0000000
Binary files a/gfx/hud/num_plus.tga and /dev/null differ
diff --git a/gfx/hud/num_plus_stroke.tga b/gfx/hud/num_plus_stroke.tga
deleted file mode 100644 (file)
index 7df2faa..0000000
Binary files a/gfx/hud/num_plus_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/accuracy.tga b/gfx/hud/old/accuracy.tga
new file mode 100644 (file)
index 0000000..2974c1d
Binary files /dev/null and b/gfx/hud/old/accuracy.tga differ
diff --git a/gfx/hud/old/accuracy_bar.tga b/gfx/hud/old/accuracy_bar.tga
new file mode 100644 (file)
index 0000000..96e853d
Binary files /dev/null and b/gfx/hud/old/accuracy_bar.tga differ
diff --git a/gfx/hud/old/ammobg.tga b/gfx/hud/old/ammobg.tga
new file mode 100644 (file)
index 0000000..7f3a2af
Binary files /dev/null and b/gfx/hud/old/ammobg.tga differ
diff --git a/gfx/hud/old/armor.tga b/gfx/hud/old/armor.tga
new file mode 100644 (file)
index 0000000..4801835
Binary files /dev/null and b/gfx/hud/old/armor.tga differ
diff --git a/gfx/hud/old/border.tga b/gfx/hud/old/border.tga
new file mode 100644 (file)
index 0000000..a3056c9
Binary files /dev/null and b/gfx/hud/old/border.tga differ
diff --git a/gfx/hud/old/bullets.tga b/gfx/hud/old/bullets.tga
new file mode 100644 (file)
index 0000000..394fa05
Binary files /dev/null and b/gfx/hud/old/bullets.tga differ
diff --git a/gfx/hud/old/cells.tga b/gfx/hud/old/cells.tga
new file mode 100644 (file)
index 0000000..5365314
Binary files /dev/null and b/gfx/hud/old/cells.tga differ
diff --git a/gfx/hud/old/dock.tga b/gfx/hud/old/dock.tga
new file mode 100644 (file)
index 0000000..2b28659
Binary files /dev/null and b/gfx/hud/old/dock.tga differ
diff --git a/gfx/hud/old/flag_blue_carrying.tga b/gfx/hud/old/flag_blue_carrying.tga
new file mode 100644 (file)
index 0000000..a8d64d1
Binary files /dev/null and b/gfx/hud/old/flag_blue_carrying.tga differ
diff --git a/gfx/hud/old/flag_blue_lost.tga b/gfx/hud/old/flag_blue_lost.tga
new file mode 100644 (file)
index 0000000..5c7e632
Binary files /dev/null and b/gfx/hud/old/flag_blue_lost.tga differ
diff --git a/gfx/hud/old/flag_blue_shielded.tga b/gfx/hud/old/flag_blue_shielded.tga
new file mode 100644 (file)
index 0000000..5da9356
Binary files /dev/null and b/gfx/hud/old/flag_blue_shielded.tga differ
diff --git a/gfx/hud/old/flag_blue_taken.tga b/gfx/hud/old/flag_blue_taken.tga
new file mode 100644 (file)
index 0000000..e6d955f
Binary files /dev/null and b/gfx/hud/old/flag_blue_taken.tga differ
diff --git a/gfx/hud/old/flag_red_carrying.tga b/gfx/hud/old/flag_red_carrying.tga
new file mode 100644 (file)
index 0000000..d1cf43d
Binary files /dev/null and b/gfx/hud/old/flag_red_carrying.tga differ
diff --git a/gfx/hud/old/flag_red_lost.tga b/gfx/hud/old/flag_red_lost.tga
new file mode 100644 (file)
index 0000000..b9d060d
Binary files /dev/null and b/gfx/hud/old/flag_red_lost.tga differ
diff --git a/gfx/hud/old/flag_red_shielded.tga b/gfx/hud/old/flag_red_shielded.tga
new file mode 100644 (file)
index 0000000..551ba61
Binary files /dev/null and b/gfx/hud/old/flag_red_shielded.tga differ
diff --git a/gfx/hud/old/flag_red_taken.tga b/gfx/hud/old/flag_red_taken.tga
new file mode 100644 (file)
index 0000000..7a1d3fc
Binary files /dev/null and b/gfx/hud/old/flag_red_taken.tga differ
diff --git a/gfx/hud/old/fuel.tga b/gfx/hud/old/fuel.tga
new file mode 100644 (file)
index 0000000..d761568
Binary files /dev/null and b/gfx/hud/old/fuel.tga differ
diff --git a/gfx/hud/old/health.tga b/gfx/hud/old/health.tga
new file mode 100644 (file)
index 0000000..1fd71d8
Binary files /dev/null and b/gfx/hud/old/health.tga differ
diff --git a/gfx/hud/old/highlight_1.tga b/gfx/hud/old/highlight_1.tga
new file mode 100644 (file)
index 0000000..0e5233c
Binary files /dev/null and b/gfx/hud/old/highlight_1.tga differ
diff --git a/gfx/hud/old/highlight_2.tga b/gfx/hud/old/highlight_2.tga
new file mode 100644 (file)
index 0000000..0629e49
Binary files /dev/null and b/gfx/hud/old/highlight_2.tga differ
diff --git a/gfx/hud/old/highlight_3.tga b/gfx/hud/old/highlight_3.tga
new file mode 100644 (file)
index 0000000..a6fb924
Binary files /dev/null and b/gfx/hud/old/highlight_3.tga differ
diff --git a/gfx/hud/old/highlight_4.tga b/gfx/hud/old/highlight_4.tga
new file mode 100644 (file)
index 0000000..ec54137
Binary files /dev/null and b/gfx/hud/old/highlight_4.tga differ
diff --git a/gfx/hud/old/key_backward.tga b/gfx/hud/old/key_backward.tga
new file mode 100644 (file)
index 0000000..4de0f33
Binary files /dev/null and b/gfx/hud/old/key_backward.tga differ
diff --git a/gfx/hud/old/key_backward_inv.tga b/gfx/hud/old/key_backward_inv.tga
new file mode 100644 (file)
index 0000000..bef0d1c
Binary files /dev/null and b/gfx/hud/old/key_backward_inv.tga differ
diff --git a/gfx/hud/old/key_bg.tga b/gfx/hud/old/key_bg.tga
new file mode 100644 (file)
index 0000000..fca30be
Binary files /dev/null and b/gfx/hud/old/key_bg.tga differ
diff --git a/gfx/hud/old/key_crouch.tga b/gfx/hud/old/key_crouch.tga
new file mode 100644 (file)
index 0000000..00b2dfe
Binary files /dev/null and b/gfx/hud/old/key_crouch.tga differ
diff --git a/gfx/hud/old/key_crouch_inv.tga b/gfx/hud/old/key_crouch_inv.tga
new file mode 100644 (file)
index 0000000..2cdbda8
Binary files /dev/null and b/gfx/hud/old/key_crouch_inv.tga differ
diff --git a/gfx/hud/old/key_forward.tga b/gfx/hud/old/key_forward.tga
new file mode 100644 (file)
index 0000000..dfe2233
Binary files /dev/null and b/gfx/hud/old/key_forward.tga differ
diff --git a/gfx/hud/old/key_forward_inv.tga b/gfx/hud/old/key_forward_inv.tga
new file mode 100644 (file)
index 0000000..7bbea60
Binary files /dev/null and b/gfx/hud/old/key_forward_inv.tga differ
diff --git a/gfx/hud/old/key_jump.tga b/gfx/hud/old/key_jump.tga
new file mode 100644 (file)
index 0000000..d02b2db
Binary files /dev/null and b/gfx/hud/old/key_jump.tga differ
diff --git a/gfx/hud/old/key_jump_inv.tga b/gfx/hud/old/key_jump_inv.tga
new file mode 100644 (file)
index 0000000..c54bb37
Binary files /dev/null and b/gfx/hud/old/key_jump_inv.tga differ
diff --git a/gfx/hud/old/key_left.tga b/gfx/hud/old/key_left.tga
new file mode 100644 (file)
index 0000000..60fe71f
Binary files /dev/null and b/gfx/hud/old/key_left.tga differ
diff --git a/gfx/hud/old/key_left_inv.tga b/gfx/hud/old/key_left_inv.tga
new file mode 100644 (file)
index 0000000..92bc615
Binary files /dev/null and b/gfx/hud/old/key_left_inv.tga differ
diff --git a/gfx/hud/old/key_right.tga b/gfx/hud/old/key_right.tga
new file mode 100644 (file)
index 0000000..308c03b
Binary files /dev/null and b/gfx/hud/old/key_right.tga differ
diff --git a/gfx/hud/old/key_right_inv.tga b/gfx/hud/old/key_right_inv.tga
new file mode 100644 (file)
index 0000000..8f04be4
Binary files /dev/null and b/gfx/hud/old/key_right_inv.tga differ
diff --git a/gfx/hud/old/kh_blue.tga b/gfx/hud/old/kh_blue.tga
new file mode 100644 (file)
index 0000000..467b229
Binary files /dev/null and b/gfx/hud/old/kh_blue.tga differ
diff --git a/gfx/hud/old/kh_bluearrow.tga b/gfx/hud/old/kh_bluearrow.tga
new file mode 100644 (file)
index 0000000..b686d1b
Binary files /dev/null and b/gfx/hud/old/kh_bluearrow.tga differ
diff --git a/gfx/hud/old/kh_pink.tga b/gfx/hud/old/kh_pink.tga
new file mode 100644 (file)
index 0000000..b40967a
Binary files /dev/null and b/gfx/hud/old/kh_pink.tga differ
diff --git a/gfx/hud/old/kh_pinkarrow.tga b/gfx/hud/old/kh_pinkarrow.tga
new file mode 100644 (file)
index 0000000..17427e5
Binary files /dev/null and b/gfx/hud/old/kh_pinkarrow.tga differ
diff --git a/gfx/hud/old/kh_red.tga b/gfx/hud/old/kh_red.tga
new file mode 100644 (file)
index 0000000..3201f8a
Binary files /dev/null and b/gfx/hud/old/kh_red.tga differ
diff --git a/gfx/hud/old/kh_redarrow.tga b/gfx/hud/old/kh_redarrow.tga
new file mode 100644 (file)
index 0000000..edd1fab
Binary files /dev/null and b/gfx/hud/old/kh_redarrow.tga differ
diff --git a/gfx/hud/old/kh_yellow.tga b/gfx/hud/old/kh_yellow.tga
new file mode 100644 (file)
index 0000000..bb83475
Binary files /dev/null and b/gfx/hud/old/kh_yellow.tga differ
diff --git a/gfx/hud/old/kh_yellowarrow.tga b/gfx/hud/old/kh_yellowarrow.tga
new file mode 100644 (file)
index 0000000..8e754cc
Binary files /dev/null and b/gfx/hud/old/kh_yellowarrow.tga differ
diff --git a/gfx/hud/old/nexball_carrying.tga b/gfx/hud/old/nexball_carrying.tga
new file mode 100644 (file)
index 0000000..58d66f7
Binary files /dev/null and b/gfx/hud/old/nexball_carrying.tga differ
diff --git a/gfx/hud/old/num_0.tga b/gfx/hud/old/num_0.tga
new file mode 100644 (file)
index 0000000..f0ab2f1
Binary files /dev/null and b/gfx/hud/old/num_0.tga differ
diff --git a/gfx/hud/old/num_0_stroke.tga b/gfx/hud/old/num_0_stroke.tga
new file mode 100644 (file)
index 0000000..e9c6e5b
Binary files /dev/null and b/gfx/hud/old/num_0_stroke.tga differ
diff --git a/gfx/hud/old/num_1.tga b/gfx/hud/old/num_1.tga
new file mode 100644 (file)
index 0000000..78f1f45
Binary files /dev/null and b/gfx/hud/old/num_1.tga differ
diff --git a/gfx/hud/old/num_1_stroke.tga b/gfx/hud/old/num_1_stroke.tga
new file mode 100644 (file)
index 0000000..1ff552f
Binary files /dev/null and b/gfx/hud/old/num_1_stroke.tga differ
diff --git a/gfx/hud/old/num_2.tga b/gfx/hud/old/num_2.tga
new file mode 100644 (file)
index 0000000..205dd03
Binary files /dev/null and b/gfx/hud/old/num_2.tga differ
diff --git a/gfx/hud/old/num_2_stroke.tga b/gfx/hud/old/num_2_stroke.tga
new file mode 100644 (file)
index 0000000..08d26df
Binary files /dev/null and b/gfx/hud/old/num_2_stroke.tga differ
diff --git a/gfx/hud/old/num_3.tga b/gfx/hud/old/num_3.tga
new file mode 100644 (file)
index 0000000..335b5da
Binary files /dev/null and b/gfx/hud/old/num_3.tga differ
diff --git a/gfx/hud/old/num_3_stroke.tga b/gfx/hud/old/num_3_stroke.tga
new file mode 100644 (file)
index 0000000..a5fddda
Binary files /dev/null and b/gfx/hud/old/num_3_stroke.tga differ
diff --git a/gfx/hud/old/num_4.tga b/gfx/hud/old/num_4.tga
new file mode 100644 (file)
index 0000000..2b9f46f
Binary files /dev/null and b/gfx/hud/old/num_4.tga differ
diff --git a/gfx/hud/old/num_4_stroke.tga b/gfx/hud/old/num_4_stroke.tga
new file mode 100644 (file)
index 0000000..fe87933
Binary files /dev/null and b/gfx/hud/old/num_4_stroke.tga differ
diff --git a/gfx/hud/old/num_5.tga b/gfx/hud/old/num_5.tga
new file mode 100644 (file)
index 0000000..8bb7043
Binary files /dev/null and b/gfx/hud/old/num_5.tga differ
diff --git a/gfx/hud/old/num_5_stroke.tga b/gfx/hud/old/num_5_stroke.tga
new file mode 100644 (file)
index 0000000..3a6978a
Binary files /dev/null and b/gfx/hud/old/num_5_stroke.tga differ
diff --git a/gfx/hud/old/num_6.tga b/gfx/hud/old/num_6.tga
new file mode 100644 (file)
index 0000000..1db8c0e
Binary files /dev/null and b/gfx/hud/old/num_6.tga differ
diff --git a/gfx/hud/old/num_6_stroke.tga b/gfx/hud/old/num_6_stroke.tga
new file mode 100644 (file)
index 0000000..f64e178
Binary files /dev/null and b/gfx/hud/old/num_6_stroke.tga differ
diff --git a/gfx/hud/old/num_7.tga b/gfx/hud/old/num_7.tga
new file mode 100644 (file)
index 0000000..0099d68
Binary files /dev/null and b/gfx/hud/old/num_7.tga differ
diff --git a/gfx/hud/old/num_7_stroke.tga b/gfx/hud/old/num_7_stroke.tga
new file mode 100644 (file)
index 0000000..252e796
Binary files /dev/null and b/gfx/hud/old/num_7_stroke.tga differ
diff --git a/gfx/hud/old/num_8.tga b/gfx/hud/old/num_8.tga
new file mode 100644 (file)
index 0000000..aa20157
Binary files /dev/null and b/gfx/hud/old/num_8.tga differ
diff --git a/gfx/hud/old/num_8_stroke.tga b/gfx/hud/old/num_8_stroke.tga
new file mode 100644 (file)
index 0000000..e2cd39d
Binary files /dev/null and b/gfx/hud/old/num_8_stroke.tga differ
diff --git a/gfx/hud/old/num_9.tga b/gfx/hud/old/num_9.tga
new file mode 100644 (file)
index 0000000..87b9c21
Binary files /dev/null and b/gfx/hud/old/num_9.tga differ
diff --git a/gfx/hud/old/num_9_stroke.tga b/gfx/hud/old/num_9_stroke.tga
new file mode 100644 (file)
index 0000000..5a8d610
Binary files /dev/null and b/gfx/hud/old/num_9_stroke.tga differ
diff --git a/gfx/hud/old/num_colon.tga b/gfx/hud/old/num_colon.tga
new file mode 100644 (file)
index 0000000..e22c09a
Binary files /dev/null and b/gfx/hud/old/num_colon.tga differ
diff --git a/gfx/hud/old/num_colon_stroke.tga b/gfx/hud/old/num_colon_stroke.tga
new file mode 100644 (file)
index 0000000..68ad28a
Binary files /dev/null and b/gfx/hud/old/num_colon_stroke.tga differ
diff --git a/gfx/hud/old/num_dot.tga b/gfx/hud/old/num_dot.tga
new file mode 100644 (file)
index 0000000..7fbfdd0
Binary files /dev/null and b/gfx/hud/old/num_dot.tga differ
diff --git a/gfx/hud/old/num_dot_stroke.tga b/gfx/hud/old/num_dot_stroke.tga
new file mode 100644 (file)
index 0000000..29ad696
Binary files /dev/null and b/gfx/hud/old/num_dot_stroke.tga differ
diff --git a/gfx/hud/old/num_minus.tga b/gfx/hud/old/num_minus.tga
new file mode 100644 (file)
index 0000000..10721f2
Binary files /dev/null and b/gfx/hud/old/num_minus.tga differ
diff --git a/gfx/hud/old/num_minus_stroke.tga b/gfx/hud/old/num_minus_stroke.tga
new file mode 100644 (file)
index 0000000..26455a0
Binary files /dev/null and b/gfx/hud/old/num_minus_stroke.tga differ
diff --git a/gfx/hud/old/num_plus.tga b/gfx/hud/old/num_plus.tga
new file mode 100644 (file)
index 0000000..3cb17b3
Binary files /dev/null and b/gfx/hud/old/num_plus.tga differ
diff --git a/gfx/hud/old/num_plus_stroke.tga b/gfx/hud/old/num_plus_stroke.tga
new file mode 100644 (file)
index 0000000..7df2faa
Binary files /dev/null and b/gfx/hud/old/num_plus_stroke.tga differ
diff --git a/gfx/hud/old/race_newfail.tga b/gfx/hud/old/race_newfail.tga
new file mode 100644 (file)
index 0000000..cd1164b
Binary files /dev/null and b/gfx/hud/old/race_newfail.tga differ
diff --git a/gfx/hud/old/race_newrankgreen.tga b/gfx/hud/old/race_newrankgreen.tga
new file mode 100644 (file)
index 0000000..c8fa157
Binary files /dev/null and b/gfx/hud/old/race_newrankgreen.tga differ
diff --git a/gfx/hud/old/race_newrankyellow.tga b/gfx/hud/old/race_newrankyellow.tga
new file mode 100644 (file)
index 0000000..0af3c59
Binary files /dev/null and b/gfx/hud/old/race_newrankyellow.tga differ
diff --git a/gfx/hud/old/race_newrecordserver.tga b/gfx/hud/old/race_newrecordserver.tga
new file mode 100644 (file)
index 0000000..aa8bae1
Binary files /dev/null and b/gfx/hud/old/race_newrecordserver.tga differ
diff --git a/gfx/hud/old/race_newtime.tga b/gfx/hud/old/race_newtime.tga
new file mode 100644 (file)
index 0000000..c9647b9
Binary files /dev/null and b/gfx/hud/old/race_newtime.tga differ
diff --git a/gfx/hud/old/rifle_ring_1.tga b/gfx/hud/old/rifle_ring_1.tga
new file mode 100644 (file)
index 0000000..a90927c
Binary files /dev/null and b/gfx/hud/old/rifle_ring_1.tga differ
diff --git a/gfx/hud/old/rifle_ring_2.tga b/gfx/hud/old/rifle_ring_2.tga
new file mode 100644 (file)
index 0000000..6f6ca4c
Binary files /dev/null and b/gfx/hud/old/rifle_ring_2.tga differ
diff --git a/gfx/hud/old/rifle_ring_3.tga b/gfx/hud/old/rifle_ring_3.tga
new file mode 100644 (file)
index 0000000..68f6df7
Binary files /dev/null and b/gfx/hud/old/rifle_ring_3.tga differ
diff --git a/gfx/hud/old/rifle_ring_4.tga b/gfx/hud/old/rifle_ring_4.tga
new file mode 100644 (file)
index 0000000..0a5db15
Binary files /dev/null and b/gfx/hud/old/rifle_ring_4.tga differ
diff --git a/gfx/hud/old/rifle_ring_5.tga b/gfx/hud/old/rifle_ring_5.tga
new file mode 100644 (file)
index 0000000..d5cc95b
Binary files /dev/null and b/gfx/hud/old/rifle_ring_5.tga differ
diff --git a/gfx/hud/old/rifle_ring_6.tga b/gfx/hud/old/rifle_ring_6.tga
new file mode 100644 (file)
index 0000000..4a126e7
Binary files /dev/null and b/gfx/hud/old/rifle_ring_6.tga differ
diff --git a/gfx/hud/old/rifle_ring_7.tga b/gfx/hud/old/rifle_ring_7.tga
new file mode 100644 (file)
index 0000000..846212b
Binary files /dev/null and b/gfx/hud/old/rifle_ring_7.tga differ
diff --git a/gfx/hud/old/rifle_ring_8.tga b/gfx/hud/old/rifle_ring_8.tga
new file mode 100644 (file)
index 0000000..137e24d
Binary files /dev/null and b/gfx/hud/old/rifle_ring_8.tga differ
diff --git a/gfx/hud/old/rocket.tga b/gfx/hud/old/rocket.tga
new file mode 100644 (file)
index 0000000..e2b4df2
Binary files /dev/null and b/gfx/hud/old/rocket.tga differ
diff --git a/gfx/hud/old/sbar.tga b/gfx/hud/old/sbar.tga
new file mode 100644 (file)
index 0000000..f93ea60
Binary files /dev/null and b/gfx/hud/old/sbar.tga differ
diff --git a/gfx/hud/old/scoreboard_bg.tga b/gfx/hud/old/scoreboard_bg.tga
new file mode 100644 (file)
index 0000000..1d9ea76
Binary files /dev/null and b/gfx/hud/old/scoreboard_bg.tga differ
diff --git a/gfx/hud/old/scoreboard_tableheader.tga b/gfx/hud/old/scoreboard_tableheader.tga
new file mode 100644 (file)
index 0000000..e43040f
Binary files /dev/null and b/gfx/hud/old/scoreboard_tableheader.tga differ
diff --git a/gfx/hud/old/shells.tga b/gfx/hud/old/shells.tga
new file mode 100644 (file)
index 0000000..24e5c72
Binary files /dev/null and b/gfx/hud/old/shells.tga differ
diff --git a/gfx/hud/old/shield.tga b/gfx/hud/old/shield.tga
new file mode 100644 (file)
index 0000000..f13f0b4
Binary files /dev/null and b/gfx/hud/old/shield.tga differ
diff --git a/gfx/hud/old/statusbar.tga b/gfx/hud/old/statusbar.tga
new file mode 100644 (file)
index 0000000..0bbad17
Binary files /dev/null and b/gfx/hud/old/statusbar.tga differ
diff --git a/gfx/hud/old/strength.tga b/gfx/hud/old/strength.tga
new file mode 100644 (file)
index 0000000..b19019d
Binary files /dev/null and b/gfx/hud/old/strength.tga differ
diff --git a/gfx/hud/old/timer.tga b/gfx/hud/old/timer.tga
new file mode 100644 (file)
index 0000000..4d7ec70
Binary files /dev/null and b/gfx/hud/old/timer.tga differ
diff --git a/gfx/hud/old/timerbg.tga b/gfx/hud/old/timerbg.tga
new file mode 100644 (file)
index 0000000..52ceaa9
Binary files /dev/null and b/gfx/hud/old/timerbg.tga differ
diff --git a/gfx/hud/old/voteprogress_back.tga b/gfx/hud/old/voteprogress_back.tga
new file mode 100644 (file)
index 0000000..10ffa13
Binary files /dev/null and b/gfx/hud/old/voteprogress_back.tga differ
diff --git a/gfx/hud/old/voteprogress_prog.tga b/gfx/hud/old/voteprogress_prog.tga
new file mode 100644 (file)
index 0000000..9f3f614
Binary files /dev/null and b/gfx/hud/old/voteprogress_prog.tga differ
diff --git a/gfx/hud/old/voteprogress_voted.tga b/gfx/hud/old/voteprogress_voted.tga
new file mode 100644 (file)
index 0000000..a21fe6a
Binary files /dev/null and b/gfx/hud/old/voteprogress_voted.tga differ
diff --git a/gfx/hud/old/weapon0.tga b/gfx/hud/old/weapon0.tga
new file mode 100644 (file)
index 0000000..b66500b
Binary files /dev/null and b/gfx/hud/old/weapon0.tga differ
diff --git a/gfx/hud/old/weapon1.tga b/gfx/hud/old/weapon1.tga
new file mode 100644 (file)
index 0000000..32f8e20
Binary files /dev/null and b/gfx/hud/old/weapon1.tga differ
diff --git a/gfx/hud/old/weapon10.tga b/gfx/hud/old/weapon10.tga
new file mode 100644 (file)
index 0000000..ae18113
Binary files /dev/null and b/gfx/hud/old/weapon10.tga differ
diff --git a/gfx/hud/old/weapon11.tga b/gfx/hud/old/weapon11.tga
new file mode 100644 (file)
index 0000000..a1f662e
Binary files /dev/null and b/gfx/hud/old/weapon11.tga differ
diff --git a/gfx/hud/old/weapon12.tga b/gfx/hud/old/weapon12.tga
new file mode 100644 (file)
index 0000000..b63c2d8
Binary files /dev/null and b/gfx/hud/old/weapon12.tga differ
diff --git a/gfx/hud/old/weapon13.tga b/gfx/hud/old/weapon13.tga
new file mode 100644 (file)
index 0000000..0a8cf7e
Binary files /dev/null and b/gfx/hud/old/weapon13.tga differ
diff --git a/gfx/hud/old/weapon14.tga b/gfx/hud/old/weapon14.tga
new file mode 100644 (file)
index 0000000..09da559
Binary files /dev/null and b/gfx/hud/old/weapon14.tga differ
diff --git a/gfx/hud/old/weapon15.tga b/gfx/hud/old/weapon15.tga
new file mode 100644 (file)
index 0000000..0a8cf7e
Binary files /dev/null and b/gfx/hud/old/weapon15.tga differ
diff --git a/gfx/hud/old/weapon2.tga b/gfx/hud/old/weapon2.tga
new file mode 100644 (file)
index 0000000..72ce481
Binary files /dev/null and b/gfx/hud/old/weapon2.tga differ
diff --git a/gfx/hud/old/weapon3.tga b/gfx/hud/old/weapon3.tga
new file mode 100644 (file)
index 0000000..91a8ce4
Binary files /dev/null and b/gfx/hud/old/weapon3.tga differ
diff --git a/gfx/hud/old/weapon4.tga b/gfx/hud/old/weapon4.tga
new file mode 100644 (file)
index 0000000..b800f0a
Binary files /dev/null and b/gfx/hud/old/weapon4.tga differ
diff --git a/gfx/hud/old/weapon5.tga b/gfx/hud/old/weapon5.tga
new file mode 100644 (file)
index 0000000..1a92967
Binary files /dev/null and b/gfx/hud/old/weapon5.tga differ
diff --git a/gfx/hud/old/weapon6.tga b/gfx/hud/old/weapon6.tga
new file mode 100644 (file)
index 0000000..7523580
Binary files /dev/null and b/gfx/hud/old/weapon6.tga differ
diff --git a/gfx/hud/old/weapon7.tga b/gfx/hud/old/weapon7.tga
new file mode 100644 (file)
index 0000000..3803159
Binary files /dev/null and b/gfx/hud/old/weapon7.tga differ
diff --git a/gfx/hud/old/weapon8.tga b/gfx/hud/old/weapon8.tga
new file mode 100644 (file)
index 0000000..bca989f
Binary files /dev/null and b/gfx/hud/old/weapon8.tga differ
diff --git a/gfx/hud/old/weapon9.tga b/gfx/hud/old/weapon9.tga
new file mode 100644 (file)
index 0000000..444247f
Binary files /dev/null and b/gfx/hud/old/weapon9.tga differ
diff --git a/gfx/hud/old/weapon_hlacmod_renameit.tga b/gfx/hud/old/weapon_hlacmod_renameit.tga
new file mode 100644 (file)
index 0000000..503dad9
Binary files /dev/null and b/gfx/hud/old/weapon_hlacmod_renameit.tga differ
diff --git a/gfx/hud/old/weaponcampingrifle.tga b/gfx/hud/old/weaponcampingrifle.tga
new file mode 100644 (file)
index 0000000..09da559
Binary files /dev/null and b/gfx/hud/old/weaponcampingrifle.tga differ
diff --git a/gfx/hud/old/weaponcrylink.tga b/gfx/hud/old/weaponcrylink.tga
new file mode 100644 (file)
index 0000000..1a92967
Binary files /dev/null and b/gfx/hud/old/weaponcrylink.tga differ
diff --git a/gfx/hud/old/weaponelectro.tga b/gfx/hud/old/weaponelectro.tga
new file mode 100644 (file)
index 0000000..b800f0a
Binary files /dev/null and b/gfx/hud/old/weaponelectro.tga differ
diff --git a/gfx/hud/old/weaponfireball.tga b/gfx/hud/old/weaponfireball.tga
new file mode 100644 (file)
index 0000000..b90d687
Binary files /dev/null and b/gfx/hud/old/weaponfireball.tga differ
diff --git a/gfx/hud/old/weapongrenadelauncher.tga b/gfx/hud/old/weapongrenadelauncher.tga
new file mode 100644 (file)
index 0000000..91a8ce4
Binary files /dev/null and b/gfx/hud/old/weapongrenadelauncher.tga differ
diff --git a/gfx/hud/old/weaponhagar.tga b/gfx/hud/old/weaponhagar.tga
new file mode 100644 (file)
index 0000000..3803159
Binary files /dev/null and b/gfx/hud/old/weaponhagar.tga differ
diff --git a/gfx/hud/old/weaponhlac.tga b/gfx/hud/old/weaponhlac.tga
new file mode 100644 (file)
index 0000000..b63c2d8
Binary files /dev/null and b/gfx/hud/old/weaponhlac.tga differ
diff --git a/gfx/hud/old/weaponhook.tga b/gfx/hud/old/weaponhook.tga
new file mode 100644 (file)
index 0000000..a1f662e
Binary files /dev/null and b/gfx/hud/old/weaponhook.tga differ
diff --git a/gfx/hud/old/weaponlaser.tga b/gfx/hud/old/weaponlaser.tga
new file mode 100644 (file)
index 0000000..b66500b
Binary files /dev/null and b/gfx/hud/old/weaponlaser.tga differ
diff --git a/gfx/hud/old/weaponminstanex.tga b/gfx/hud/old/weaponminstanex.tga
new file mode 100644 (file)
index 0000000..ae18113
Binary files /dev/null and b/gfx/hud/old/weaponminstanex.tga differ
diff --git a/gfx/hud/old/weaponnex.tga b/gfx/hud/old/weaponnex.tga
new file mode 100644 (file)
index 0000000..7523580
Binary files /dev/null and b/gfx/hud/old/weaponnex.tga differ
diff --git a/gfx/hud/old/weaponporto.tga b/gfx/hud/old/weaponporto.tga
new file mode 100644 (file)
index 0000000..444247f
Binary files /dev/null and b/gfx/hud/old/weaponporto.tga differ
diff --git a/gfx/hud/old/weaponrocketlauncher.tga b/gfx/hud/old/weaponrocketlauncher.tga
new file mode 100644 (file)
index 0000000..bca989f
Binary files /dev/null and b/gfx/hud/old/weaponrocketlauncher.tga differ
diff --git a/gfx/hud/old/weaponseeker.tga b/gfx/hud/old/weaponseeker.tga
new file mode 100644 (file)
index 0000000..0a8cf7e
Binary files /dev/null and b/gfx/hud/old/weaponseeker.tga differ
diff --git a/gfx/hud/old/weaponshotgun.tga b/gfx/hud/old/weaponshotgun.tga
new file mode 100644 (file)
index 0000000..32f8e20
Binary files /dev/null and b/gfx/hud/old/weaponshotgun.tga differ
diff --git a/gfx/hud/old/weapontuba.tga b/gfx/hud/old/weapontuba.tga
new file mode 100644 (file)
index 0000000..ba59aca
Binary files /dev/null and b/gfx/hud/old/weapontuba.tga differ
diff --git a/gfx/hud/old/weaponuzi.tga b/gfx/hud/old/weaponuzi.tga
new file mode 100644 (file)
index 0000000..72ce481
Binary files /dev/null and b/gfx/hud/old/weaponuzi.tga differ
diff --git a/gfx/hud/race/newfail.tga b/gfx/hud/race/newfail.tga
deleted file mode 100644 (file)
index cd1164b..0000000
Binary files a/gfx/hud/race/newfail.tga and /dev/null differ
diff --git a/gfx/hud/race/newrankgreen.tga b/gfx/hud/race/newrankgreen.tga
deleted file mode 100644 (file)
index c8fa157..0000000
Binary files a/gfx/hud/race/newrankgreen.tga and /dev/null differ
diff --git a/gfx/hud/race/newrankyellow.tga b/gfx/hud/race/newrankyellow.tga
deleted file mode 100644 (file)
index 0af3c59..0000000
Binary files a/gfx/hud/race/newrankyellow.tga and /dev/null differ
diff --git a/gfx/hud/race/newrecordserver.tga b/gfx/hud/race/newrecordserver.tga
deleted file mode 100644 (file)
index aa8bae1..0000000
Binary files a/gfx/hud/race/newrecordserver.tga and /dev/null differ
diff --git a/gfx/hud/race/newtime.tga b/gfx/hud/race/newtime.tga
deleted file mode 100644 (file)
index c9647b9..0000000
Binary files a/gfx/hud/race/newtime.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_1.tga b/gfx/hud/rifle_ring_1.tga
deleted file mode 100644 (file)
index a90927c..0000000
Binary files a/gfx/hud/rifle_ring_1.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_2.tga b/gfx/hud/rifle_ring_2.tga
deleted file mode 100644 (file)
index 6f6ca4c..0000000
Binary files a/gfx/hud/rifle_ring_2.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_3.tga b/gfx/hud/rifle_ring_3.tga
deleted file mode 100644 (file)
index 68f6df7..0000000
Binary files a/gfx/hud/rifle_ring_3.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_4.tga b/gfx/hud/rifle_ring_4.tga
deleted file mode 100644 (file)
index 0a5db15..0000000
Binary files a/gfx/hud/rifle_ring_4.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_5.tga b/gfx/hud/rifle_ring_5.tga
deleted file mode 100644 (file)
index d5cc95b..0000000
Binary files a/gfx/hud/rifle_ring_5.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_6.tga b/gfx/hud/rifle_ring_6.tga
deleted file mode 100644 (file)
index 4a126e7..0000000
Binary files a/gfx/hud/rifle_ring_6.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_7.tga b/gfx/hud/rifle_ring_7.tga
deleted file mode 100644 (file)
index 846212b..0000000
Binary files a/gfx/hud/rifle_ring_7.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_8.tga b/gfx/hud/rifle_ring_8.tga
deleted file mode 100644 (file)
index 137e24d..0000000
Binary files a/gfx/hud/rifle_ring_8.tga and /dev/null differ
diff --git a/gfx/hud/sb_accuracy.tga b/gfx/hud/sb_accuracy.tga
deleted file mode 100644 (file)
index 2974c1d..0000000
Binary files a/gfx/hud/sb_accuracy.tga and /dev/null differ
diff --git a/gfx/hud/sb_accuracy_bar.tga b/gfx/hud/sb_accuracy_bar.tga
deleted file mode 100644 (file)
index 96e853d..0000000
Binary files a/gfx/hud/sb_accuracy_bar.tga and /dev/null differ
diff --git a/gfx/hud/sb_ammobg.tga b/gfx/hud/sb_ammobg.tga
deleted file mode 100644 (file)
index 7f3a2af..0000000
Binary files a/gfx/hud/sb_ammobg.tga and /dev/null differ
diff --git a/gfx/hud/sb_armor.tga b/gfx/hud/sb_armor.tga
deleted file mode 100644 (file)
index 4801835..0000000
Binary files a/gfx/hud/sb_armor.tga and /dev/null differ
diff --git a/gfx/hud/sb_bullets.tga b/gfx/hud/sb_bullets.tga
deleted file mode 100644 (file)
index 394fa05..0000000
Binary files a/gfx/hud/sb_bullets.tga and /dev/null differ
diff --git a/gfx/hud/sb_cells.tga b/gfx/hud/sb_cells.tga
deleted file mode 100644 (file)
index 5365314..0000000
Binary files a/gfx/hud/sb_cells.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_blue_carrying.tga b/gfx/hud/sb_flag_blue_carrying.tga
deleted file mode 100644 (file)
index a8d64d1..0000000
Binary files a/gfx/hud/sb_flag_blue_carrying.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_blue_lost.tga b/gfx/hud/sb_flag_blue_lost.tga
deleted file mode 100644 (file)
index 5c7e632..0000000
Binary files a/gfx/hud/sb_flag_blue_lost.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_blue_shielded.tga b/gfx/hud/sb_flag_blue_shielded.tga
deleted file mode 100644 (file)
index 5da9356..0000000
Binary files a/gfx/hud/sb_flag_blue_shielded.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_blue_taken.tga b/gfx/hud/sb_flag_blue_taken.tga
deleted file mode 100644 (file)
index e6d955f..0000000
Binary files a/gfx/hud/sb_flag_blue_taken.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_red_carrying.tga b/gfx/hud/sb_flag_red_carrying.tga
deleted file mode 100644 (file)
index d1cf43d..0000000
Binary files a/gfx/hud/sb_flag_red_carrying.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_red_lost.tga b/gfx/hud/sb_flag_red_lost.tga
deleted file mode 100644 (file)
index b9d060d..0000000
Binary files a/gfx/hud/sb_flag_red_lost.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_red_shielded.tga b/gfx/hud/sb_flag_red_shielded.tga
deleted file mode 100644 (file)
index 551ba61..0000000
Binary files a/gfx/hud/sb_flag_red_shielded.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_red_taken.tga b/gfx/hud/sb_flag_red_taken.tga
deleted file mode 100644 (file)
index 7a1d3fc..0000000
Binary files a/gfx/hud/sb_flag_red_taken.tga and /dev/null differ
diff --git a/gfx/hud/sb_fuel.tga b/gfx/hud/sb_fuel.tga
deleted file mode 100644 (file)
index d761568..0000000
Binary files a/gfx/hud/sb_fuel.tga and /dev/null differ
diff --git a/gfx/hud/sb_health.tga b/gfx/hud/sb_health.tga
deleted file mode 100644 (file)
index 1fd71d8..0000000
Binary files a/gfx/hud/sb_health.tga and /dev/null differ
diff --git a/gfx/hud/sb_highlight_1.tga b/gfx/hud/sb_highlight_1.tga
deleted file mode 100644 (file)
index 0e5233c..0000000
Binary files a/gfx/hud/sb_highlight_1.tga and /dev/null differ
diff --git a/gfx/hud/sb_highlight_2.tga b/gfx/hud/sb_highlight_2.tga
deleted file mode 100644 (file)
index 0629e49..0000000
Binary files a/gfx/hud/sb_highlight_2.tga and /dev/null differ
diff --git a/gfx/hud/sb_highlight_3.tga b/gfx/hud/sb_highlight_3.tga
deleted file mode 100644 (file)
index a6fb924..0000000
Binary files a/gfx/hud/sb_highlight_3.tga and /dev/null differ
diff --git a/gfx/hud/sb_highlight_4.tga b/gfx/hud/sb_highlight_4.tga
deleted file mode 100644 (file)
index ec54137..0000000
Binary files a/gfx/hud/sb_highlight_4.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_blue.tga b/gfx/hud/sb_kh_blue.tga
deleted file mode 100644 (file)
index 467b229..0000000
Binary files a/gfx/hud/sb_kh_blue.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_bluearrow.tga b/gfx/hud/sb_kh_bluearrow.tga
deleted file mode 100644 (file)
index b686d1b..0000000
Binary files a/gfx/hud/sb_kh_bluearrow.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_pink.tga b/gfx/hud/sb_kh_pink.tga
deleted file mode 100644 (file)
index b40967a..0000000
Binary files a/gfx/hud/sb_kh_pink.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_pinkarrow.tga b/gfx/hud/sb_kh_pinkarrow.tga
deleted file mode 100644 (file)
index 17427e5..0000000
Binary files a/gfx/hud/sb_kh_pinkarrow.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_red.tga b/gfx/hud/sb_kh_red.tga
deleted file mode 100644 (file)
index 3201f8a..0000000
Binary files a/gfx/hud/sb_kh_red.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_redarrow.tga b/gfx/hud/sb_kh_redarrow.tga
deleted file mode 100644 (file)
index edd1fab..0000000
Binary files a/gfx/hud/sb_kh_redarrow.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_yellow.tga b/gfx/hud/sb_kh_yellow.tga
deleted file mode 100644 (file)
index bb83475..0000000
Binary files a/gfx/hud/sb_kh_yellow.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_yellowarrow.tga b/gfx/hud/sb_kh_yellowarrow.tga
deleted file mode 100644 (file)
index 8e754cc..0000000
Binary files a/gfx/hud/sb_kh_yellowarrow.tga and /dev/null differ
diff --git a/gfx/hud/sb_nexball_carrying.tga b/gfx/hud/sb_nexball_carrying.tga
deleted file mode 100644 (file)
index 58d66f7..0000000
Binary files a/gfx/hud/sb_nexball_carrying.tga and /dev/null differ
diff --git a/gfx/hud/sb_rocket.tga b/gfx/hud/sb_rocket.tga
deleted file mode 100644 (file)
index e2b4df2..0000000
Binary files a/gfx/hud/sb_rocket.tga and /dev/null differ
diff --git a/gfx/hud/sb_scoreboard_bg.tga b/gfx/hud/sb_scoreboard_bg.tga
deleted file mode 100644 (file)
index 1d9ea76..0000000
Binary files a/gfx/hud/sb_scoreboard_bg.tga and /dev/null differ
diff --git a/gfx/hud/sb_scoreboard_tableheader.tga b/gfx/hud/sb_scoreboard_tableheader.tga
deleted file mode 100644 (file)
index e43040f..0000000
Binary files a/gfx/hud/sb_scoreboard_tableheader.tga and /dev/null differ
diff --git a/gfx/hud/sb_shells.tga b/gfx/hud/sb_shells.tga
deleted file mode 100644 (file)
index 24e5c72..0000000
Binary files a/gfx/hud/sb_shells.tga and /dev/null differ
diff --git a/gfx/hud/sb_shield.tga b/gfx/hud/sb_shield.tga
deleted file mode 100644 (file)
index f13f0b4..0000000
Binary files a/gfx/hud/sb_shield.tga and /dev/null differ
diff --git a/gfx/hud/sb_strength.tga b/gfx/hud/sb_strength.tga
deleted file mode 100644 (file)
index b19019d..0000000
Binary files a/gfx/hud/sb_strength.tga and /dev/null differ
diff --git a/gfx/hud/sb_timer.tga b/gfx/hud/sb_timer.tga
deleted file mode 100644 (file)
index 4d7ec70..0000000
Binary files a/gfx/hud/sb_timer.tga and /dev/null differ
diff --git a/gfx/hud/sb_timerbg.tga b/gfx/hud/sb_timerbg.tga
deleted file mode 100644 (file)
index 52ceaa9..0000000
Binary files a/gfx/hud/sb_timerbg.tga and /dev/null differ
diff --git a/gfx/hud/sbar.tga b/gfx/hud/sbar.tga
deleted file mode 100644 (file)
index f93ea60..0000000
Binary files a/gfx/hud/sbar.tga and /dev/null differ
diff --git a/gfx/hud/statusbar.tga b/gfx/hud/statusbar.tga
deleted file mode 100644 (file)
index 0bbad17..0000000
Binary files a/gfx/hud/statusbar.tga and /dev/null differ
diff --git a/gfx/hud/voteprogress_back.tga b/gfx/hud/voteprogress_back.tga
deleted file mode 100644 (file)
index 10ffa13..0000000
Binary files a/gfx/hud/voteprogress_back.tga and /dev/null differ
diff --git a/gfx/hud/voteprogress_prog.tga b/gfx/hud/voteprogress_prog.tga
deleted file mode 100644 (file)
index 9f3f614..0000000
Binary files a/gfx/hud/voteprogress_prog.tga and /dev/null differ
diff --git a/gfx/hud/voteprogress_voted.tga b/gfx/hud/voteprogress_voted.tga
deleted file mode 100644 (file)
index a21fe6a..0000000
Binary files a/gfx/hud/voteprogress_voted.tga and /dev/null differ
index 8891586c1e781873fa063b784d44efc85c1d4d47..b1e418215c9b86278bc4803615ec7219c720e5b0 100644 (file)
@@ -82,6 +82,8 @@ void CSQC_Init(void)
        // localcmd("alias order \"cmd order $*\""); enable if ctf-command thingy is used
        //registercmd("ctf_menu");
        registercmd("ons_map");
+       registercmd("hud_configure");
+       registercmd("hud_save");
        //registercmd("menu_action");
 
        registercmd("+button3");
@@ -364,7 +366,18 @@ float CSQC_ConsoleCommand(string strMessage)
        local string strCmd;
        strCmd = argv(0);
 
-       if(strCmd == "+button4") { // zoom
+       if(strCmd == "hud_configure") { // config hud
+               cvar_set("_hud_configure", ftos(!cvar("_hud_configure")));
+               return true;
+       } else if(strCmd == "hud_save") { // save hud config
+               if(argv(1) == "" || argv(2)) {
+                       print("Usage:\n");
+                       print("hud_save configname   (saves to hud_skinname_configname.cfg)\n");
+               }
+               else
+                       HUD_Panel_ExportCfg(argv(1));
+               return true;
+       } else if(strCmd == "+button4") { // zoom
                // return false, because the message shall be sent to the server anyway (for demos/speccing)
                if(ignore_plus_zoom)
                {
index 222823039d2007bda59887eb887826557901575f..8c012c5d73d6290ff33020d9238c12e51aea731c 100644 (file)
@@ -75,6 +75,11 @@ 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(pos, strcat("gfx/hud/", hud_skin, "/", pic), sz, color, alpha, drawflag);
+}
+
 // return HUD background color
 vector HUD_GetBgColor()
 {
@@ -172,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(hl_pos, strcat("gfx/hud/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)
@@ -183,14 +188,14 @@ void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float le
        if(minus)
        {
                if (stroke == 1)
-                       drawpic(pos, "gfx/hud/num_minus_stroke", vsize, rgb, alpha, dflags);
-               drawpic(pos, "gfx/hud/num_minus", vsize, num_color, alpha, dflags);
+                       drawpic_skin(pos, "num_minus_stroke", vsize, rgb, alpha, dflags);
+               drawpic_skin(pos, "num_minus", vsize, num_color, alpha, dflags);
                pos_x += lettersize;
        } else if(plus)
        {
                if (stroke == 1)
-                       drawpic(pos, "gfx/hud/num_plus_stroke", vsize, rgb, alpha, dflags);
-               drawpic(pos, "gfx/hud/num_plus", vsize, num_color, alpha, dflags);
+                       drawpic_skin(pos, "num_plus_stroke", vsize, rgb, alpha, dflags);
+               drawpic_skin(pos, "num_plus", vsize, num_color, alpha, dflags);
                pos_x += lettersize;
        }
 
@@ -198,8 +203,8 @@ void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float le
        {
                tmp = substring(str, i, 1);
                if (stroke == 1)
-                       drawpic(pos, strcat("gfx/hud/num_", tmp, "_stroke"), vsize, rgb, alpha, dflags);
-               drawpic(pos, strcat("gfx/hud/num_", tmp), vsize, num_color, alpha, dflags);
+                       drawpic_skin(pos, strcat("num_", tmp, "_stroke"), vsize, rgb, alpha, dflags);
+               drawpic_skin(pos, strcat("num_", tmp), vsize, num_color, alpha, dflags);
                pos_x += lettersize;
        }
 }
@@ -555,6 +560,31 @@ string HUD_Panel_GetName(float id)
        }
 }
 
+// Save the config
+void HUD_Panel_ExportCfg(string cfgname)
+{
+       float fh;
+       fh = fopen(strcat("hud_", hud_skin, "_", cfgname, ".cfg"), FILE_WRITE);
+       if(fh >= 0)
+       {
+               float i;
+               for (i = 0; i < panel_cnt; ++i)
+               {
+                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), " ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i))))));
+                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_pos \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_pos")), "\""));
+                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_size \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_size")), "\""));
+                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg")), "\""));
+                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_color \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_color")), "\""));
+                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_alpha ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_bg_alpha")))));
+                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_border ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_bg_border")))));
+                       fputs(fh, "");
+               }
+
+               print("^2Successfully exported to hud_", hud_skin, "_", cfgname, ".cfg");
+       }
+       fclose(fh);
+}
+
 vector HUD_Panel_CheckLimitSize(float id, vector mySize)
 {
        switch(id) {
@@ -636,7 +666,7 @@ float HUD_Panel_GetBorder(float id)
 // draw the background/borders
 void HUD_Panel_DrawBg(float id, vector pos, vector mySize)
 {
-       if(!cvar("_hud_configure") && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg")) == "0")
+       if(!hud_configure && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg")) == "0")
                return;
 
        string bg;
@@ -659,10 +689,10 @@ void HUD_Panel_DrawBg(float id, vector pos, vector mySize)
                alpha = cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_alpha"));
                if(!alpha)
                        alpha = cvar("hud_bg_alpha");
-               if(cvar("_hud_configure"))
+               if(hud_configure)
                        alpha = max(cvar("hud_configure_bg_minalpha"), alpha);
 
-               draw_BorderPicture(pos - '1 1 0' * border, strcat("gfx/hud/", bg), mySize + '1 1 0' * 2 * border, color, alpha, '1 1 0' * (border/BORDER_MULTIPLIER));
+               draw_BorderPicture(pos - '1 1 0' * border, strcat("gfx/hud/", hud_skin, "/", bg), mySize + '1 1 0' * 2 * border, color, alpha, '1 1 0' * (border/BORDER_MULTIPLIER));
        }
 }
 
@@ -926,7 +956,7 @@ void HUD_Panel_Mouse()
        mousepos_x = bound(0, mousepos_x, vid_conwidth);
        mousepos_y = bound(0, mousepos_y, vid_conheight);
 
-       drawpic(mousepos, "gfx/menu/default/cursor.tga", '32 32 0', '1 1 1', 1, hud_alpha_fg);
+       drawpic_skin(mousepos, "gfx/menu/default/cursor.tga", '32 32 0', '1 1 1', 1, hud_alpha_fg);
 
        if(mouseClicked)
        {
@@ -1067,7 +1097,7 @@ void HUD_WeaponIcons()
        for(i = WEP_FIRST; i <= WEP_LAST; ++i)
        {
                self = get_weaponinfo(i);
-               if(self.weapons && (self.impulse >= 0) && (stat_weapons & self.weapons) || cvar("_hud_configure"))
+               if(self.weapons && (self.impulse >= 0) && (stat_weapons & self.weapons) || hud_configure)
                {
                        weaponorder[weapon_cnt] = self;
                        ++weapon_cnt;
@@ -1106,7 +1136,7 @@ void HUD_WeaponIcons()
        for(i = 0; i < weapon_cnt; ++i)
        {
                self = weaponorder[i];
-               if((self.weapons && (self.impulse >= 0) && (stat_weapons & self.weapons)) || cvar("_hud_configure"))
+               if((self.weapons && (self.impulse >= 0) && (stat_weapons & self.weapons)) || hud_configure)
                {
                        id = self.impulse;
 
@@ -1116,8 +1146,8 @@ void HUD_WeaponIcons()
                        weapon_damage = weapon_fired[self.weapon-WEP_FIRST];
 
                        if(self.weapon == activeweapon)
-                               drawpic(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "gfx/hud/sb_ammobg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * hud_alpha_fg, DRAWFLAG_NORMAL);
-                       drawpic(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("gfx/hud/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);
@@ -1130,7 +1160,7 @@ void HUD_WeaponIcons()
 
                                accuracy_color = HUD_AccuracyColor(weapon_stats);
                                if(weapon_damage)
-                                       drawpic(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) - '2 0 0' + eY * (mySize_y/rows - accuracybar_height), "gfx/hud/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);
                        }
                }
 
@@ -1177,11 +1207,11 @@ string GetAmmoPicture(float i)
 {
        switch(i)
        {
-               case 0: return "gfx/hud/sb_shells";
-               case 1: return "gfx/hud/sb_bullets";
-               case 2: return "gfx/hud/sb_rocket";
-               case 3: return "gfx/hud/sb_cells";
-               case 4: return "gfx/hud/sb_fuel";
+               case 0: return "shells";
+               case 1: return "bullets";
+               case 2: return "rocket";
+               case 3: return "cells";
+               case 4: return "fuel";
                default: return "";
        }
 }
@@ -1202,13 +1232,13 @@ void HUD_Inventory()
        for (i = 0; i < 4; ++i) {
                float a;
                a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i?
-               if(cvar("_hud_configure"))
+               if(hud_configure)
                        a = 100;
 
                if(cvar("hud_inventory_onlycurrent")) {
                        if (stat_items & GetAmmoItemCode(i)) {
-                               drawpic(pos, "gfx/hud/sb_ammobg", mySize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-                               drawpic(pos + eY * 0.05 * mySize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mySize_y, '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);
                                else
@@ -1246,8 +1276,8 @@ void HUD_Inventory()
                                }
 
                                if (stat_items & GetAmmoItemCode(i))
-                                       drawpic(mypos, "gfx/hud/sb_ammobg", mysize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-                               drawpic(mypos + eY * 0.05 * mysize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mysize_y, '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))
                                                HUD_DrawXNum(mypos + 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);
@@ -1272,7 +1302,7 @@ void HUD_Powerups() {
        float stat_items;
        stat_items = getstati(STAT_ITEMS);
 
-       if(!cvar("_hud_configure"))
+       if(!hud_configure)
        {
                if not(stat_items & IT_STRENGTH)
                        if not(stat_items & IT_INVINCIBLE)
@@ -1293,7 +1323,7 @@ void HUD_Powerups() {
        strength_time = bound(0, ceil(getstatf(STAT_STRENGTH_FINISHED) - time), 99);
        shield_time = bound(0, ceil(getstatf(STAT_INVINCIBLE_FINISHED) - time), 99);
 
-       if(cvar("_hud_configure"))
+       if(hud_configure)
        {
                strength_time = 15;
                shield_time = 27;
@@ -1325,15 +1355,15 @@ void HUD_Powerups() {
                {
                        len = strlen(ftos(leftcnt));
 
-                       drawpic(pos, "gfx/hud/statusbar", eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
-                       drawpic(pos, strcat("gfx/hud/sb_", leftname), '1 1 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+                       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("", 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(pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/30), "gfx/hud/statusbar", eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
-                       drawpic(pos + eX * mySize_x - eX * mySize_y, strcat("gfx/hud/sb_", rightname), '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+                       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("", 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);
                }
        }
@@ -1343,8 +1373,8 @@ void HUD_Powerups() {
                {
                        len = strlen(ftos(leftcnt));
 
-                       drawpic(pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/30), "gfx/hud/statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30), HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
-                       drawpic(pos + eX * 0.4 * mySize_y, strcat("gfx/hud/sb_", leftname), '0.7 0.7 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+                       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("", 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);
                }
 
@@ -1352,8 +1382,8 @@ void HUD_Powerups() {
                {
                        len = strlen(ftos(rightcnt));
                        
-                       drawpic(pos + eX * 0.5 * mySize_x + eY * mySize_y - eY * mySize_y * min(1, rightcnt/30), "gfx/hud/statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30), HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
-                       drawpic(pos + eX * mySize_x - eX * 1.1 * mySize_y, strcat("gfx/hud/sb_", rightname), '0.7 0.7 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+                       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("", 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);
                }
        }
@@ -1363,8 +1393,8 @@ void HUD_Powerups() {
                {
                        len = strlen(ftos(leftcnt));
 
-                       drawpic(pos, "gfx/hud/statusbar", eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
-                       drawpic(pos, strcat("gfx/hud/sb_", leftname), '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+                       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("", 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);
                }
 
@@ -1372,8 +1402,8 @@ void HUD_Powerups() {
                {
                        len = strlen(ftos(rightcnt));
 
-                       drawpic(pos + eY * 0.5 * mySize_y, "gfx/hud/statusbar", eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
-                       drawpic(pos + eY * 0.5 * mySize_y, strcat("gfx/hud/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, "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("", 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);
                }
        }
@@ -1386,18 +1416,18 @@ void HUD_Powerups() {
                {
                        if(dt < 5)
                        {
-                               drawpic_expanding_two(pos, "gfx/hud/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(pos, "gfx/hud/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, "gfx/hud/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));
                }
        }
@@ -1409,18 +1439,18 @@ void HUD_Powerups() {
                {
                        if(dt < 5)
                        {
-                               drawpic_expanding_two(pos - '0 -22 0', "gfx/hud/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(pos - '0 -22 0', "gfx/hud/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', "gfx/hud/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));
                }
        }
@@ -1440,7 +1470,7 @@ void HUD_HealthArmor(void)
        float armor, health, x;
        armor = getstati(STAT_ARMOR);
        health = getstati(STAT_HEALTH);
-       if(cvar("_hud_configure"))
+       if(hud_configure)
        {
                armor = 150;
                health = 100;
@@ -1465,13 +1495,13 @@ void HUD_HealthArmor(void)
                if(v_z) // fully armored
                {
                        // here, armorideal > armor
-                       drawpic(num_pos + '78 -4.5 0', "gfx/hud/sb_health", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-                       drawpic(num_pos + '108 -4.5 0', "gfx/hud/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(num_pos + '108 -4.5 0', "gfx/hud/sb_health", '20 20 0', '1 1 1', hud_alpha_fg * v_y / armor, DRAWFLAG_NORMAL);
-                       drawpic(num_pos + '78 -4.5 0', "gfx/hud/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
        }
@@ -1516,20 +1546,20 @@ void HUD_HealthArmor(void)
                        {
                                len = strlen(ftos(leftcnt));
 
-                               drawpic(pos, "gfx/hud/statusbar", eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
-                               drawpic(pos, strcat("gfx/hud/sb_", leftname), '1 1 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+                               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("", 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(pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/200), "gfx/hud/statusbar", eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
-                               drawpic(pos + eX * mySize_x - eX * mySize_y, strcat("gfx/hud/sb_", rightname), '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+                               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("", 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);
                        }
 
                        if(fuel)
-                               drawpic(pos, "gfx/hud/statusbar", eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y, HUD_Panel_GetProgressBarColor("fuel"), hud_alpha_fg * 0.8, DRAWFLAG_NORMAL);
+                               drawpic_skin(pos, "statusbar", eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y, HUD_Panel_GetProgressBarColor("fuel"), hud_alpha_fg * 0.8, DRAWFLAG_NORMAL);
                }
                else if (mySize_x/mySize_y > 3.2)
                {
@@ -1537,8 +1567,8 @@ void HUD_HealthArmor(void)
                        {
                                len = strlen(ftos(leftcnt));
 
-                               drawpic(pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200), "gfx/hud/statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200), HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
-                               drawpic(pos + eX * 0.4 * mySize_y, strcat("gfx/hud/sb_", leftname), '0.7 0.7 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+                               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("", 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);
                        }
 
@@ -1546,13 +1576,13 @@ void HUD_HealthArmor(void)
                        {
                                len = strlen(ftos(rightcnt));
                                
-                               drawpic(pos + eX * 0.5 * mySize_x + eY * mySize_y - eY * mySize_y * min(1, rightcnt/200), "gfx/hud/statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200), HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
-                               drawpic(pos + eX * mySize_x - eX * 1.1 * mySize_y, strcat("gfx/hud/sb_", rightname), '0.7 0.7 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+                               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("", 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);
                        }
 
                        if(fuel)
-                               drawpic(pos, "gfx/hud/statusbar", eX * mySize_x * min(1, fuel/100) + eY * 0.15 * mySize_y, HUD_Panel_GetProgressBarColor("fuel"), hud_alpha_fg * 0.8, DRAWFLAG_NORMAL);
+                               drawpic_skin(pos, "statusbar", eX * mySize_x * min(1, fuel/100) + eY * 0.15 * mySize_y, HUD_Panel_GetProgressBarColor("fuel"), hud_alpha_fg * 0.8, DRAWFLAG_NORMAL);
                }
                else
                {
@@ -1560,8 +1590,8 @@ void HUD_HealthArmor(void)
                        {
                                len = strlen(ftos(leftcnt));
 
-                               drawpic(pos, "gfx/hud/statusbar", eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
-                               drawpic(pos, strcat("gfx/hud/sb_", leftname), '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+                               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("", 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);
                        }
 
@@ -1569,13 +1599,13 @@ void HUD_HealthArmor(void)
                        {
                                len = strlen(ftos(rightcnt));
 
-                               drawpic(pos + eY * 0.5 * mySize_y, "gfx/hud/statusbar", eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
-                               drawpic(pos + eY * 0.5 * mySize_y, strcat("gfx/hud/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, "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("", 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);
                        }
 
                        if(fuel)
-                               drawpic(pos, "gfx/hud/statusbar", eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y, HUD_Panel_GetProgressBarColor("fuel"), hud_alpha_fg * 0.8, DRAWFLAG_NORMAL);
+                               drawpic_skin(pos, "statusbar", eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y, HUD_Panel_GetProgressBarColor("fuel"), hud_alpha_fg * 0.8, DRAWFLAG_NORMAL);
                }
        }
 }
@@ -1602,7 +1632,7 @@ void HUD_Score()
                if(pl == me)
                        pl = pl.sort_next;
 
-               if(cvar("_hud_configure"))
+               if(hud_configure)
                        distribution = 42;
                else if(pl)
                        distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
@@ -1610,7 +1640,7 @@ void HUD_Score()
                        distribution = 0;
 
                score = me.(scores[ps_primary]);
-               if(cvar("_hud_configure"))
+               if(hud_configure)
                        score = 123;
 
                if(distribution >= 5) {
@@ -1629,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(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("gfx/hud/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;
@@ -1637,10 +1667,10 @@ void HUD_Score()
 
                float teamnum;
                for(tm = teams.sort_next; tm; tm = tm.sort_next) {
-                       if(tm.team == COLOR_SPECTATOR || (!tm.team_size && !cvar("_hud_configure"))) // no players? don't display
+                       if(tm.team == COLOR_SPECTATOR || (!tm.team_size && !hud_configure)) // no players? don't display
                                continue;
                        score = tm.(teamscores[ts_primary]);
-                       if(cvar("_hud_configure"))
+                       if(hud_configure)
                                score = 123;
                        leader = 0;
                        
@@ -1653,13 +1683,13 @@ void HUD_Score()
                                if (max_fragcount == score)
                                        leader = 1;
                                if (leader)
-                                       drawpic(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("gfx/hud/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(pos + eX * mySize_x - eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y * teamnum, strcat("gfx/hud/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;
                        }
@@ -1680,7 +1710,7 @@ void HUD_RaceTimer (void) {
        float a, t;
        string s, forcetime;
 
-       if(cvar("_hud_configure"))
+       if(hud_configure)
        {
                s = "0:13:37";
                drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.75 0.75 0' * mySize_y), s, '0.75 0.75 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
@@ -1945,7 +1975,7 @@ void HUD_VoteWindow(void)
        else
                vote_alpha = bound(0, 1 - (time - vote_change) * 2, 1);
 
-       if(cvar("_hud_configure"))
+       if(hud_configure)
        {
                vote_alpha = 1;
                vote_yescount = 3;
@@ -1958,12 +1988,12 @@ void HUD_VoteWindow(void)
        if(vote_alpha) {
                a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1);
 
-               drawpic(pos, "gfx/hud/voteprogress_back", mySize, HUD_GetBgColor(), a * hud_alpha_bg, DRAWFLAG_NORMAL);
+               drawpic_skin(pos, "voteprogress_back", mySize, HUD_GetBgColor(), a * hud_alpha_bg, DRAWFLAG_NORMAL);
 
                s = "A vote has been called for: ";
                drawstring(pos + '0.5 0 0' * mySize_x + '0 0.1 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/5)), s, '1 1 0' * mySize_y*(1/5), '1 1 1', a * hud_alpha_fg, DRAWFLAG_NORMAL);
                s = textShortenToWidth(vote_called_vote, mySize_x * 0.96, '10 0 0', stringwidth_colors);
-               if(cvar("_hud_configure"))
+               if(hud_configure)
                        s = "Configure the HUD";
                drawcolorcodedstring(pos + '0.52 0 0' * mySize_x + '0 0.3 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/6)), s, '1 1 0' * mySize_y*(1/6), a * hud_alpha_fg, DRAWFLAG_NORMAL);
 
@@ -1975,19 +2005,19 @@ void HUD_VoteWindow(void)
 
                // draw the progress bars
                drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y);
-               drawpic(pos, "gfx/hud/voteprogress_prog", mySize, eY, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawpic_skin(pos, "voteprogress_prog", mySize, eY, a * hud_alpha_fg, DRAWFLAG_NORMAL);
 
                drawsetcliparea(pos_x + mySize_x - mySize_x * 0.5 * (vote_nocount/vote_needed), pos_y, mySize_x * 0.5, mySize_y);
-               drawpic(pos, "gfx/hud/voteprogress_prog", mySize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawpic_skin(pos, "voteprogress_prog", mySize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL);
 
                // draw the highlights
                if(vote_highlighted == 1) {
                        drawsetcliparea(pos_x, pos_y, mySize_x * 0.5, mySize_y);
-                       drawpic(pos, "gfx/hud/voteprogress_voted", mySize, eY, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+                       drawpic_skin(pos, "voteprogress_voted", mySize, eY, a * hud_alpha_fg, DRAWFLAG_NORMAL);
                }
                else if(vote_highlighted == 2) {
                        drawsetcliparea(pos_x + 0.5 * mySize_x, pos_y, mySize_x * 0.5, mySize_y);
-                       drawpic(pos, "gfx/hud/voteprogress_voted", mySize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+                       drawpic_skin(pos, "voteprogress_voted", mySize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL);
                }
 
                drawresetcliparea();
@@ -2024,20 +2054,20 @@ void HUD_DrawRaceStatus(vector pos)
        rankname = race_PlaceName(rank);
 
        if(race_status == 0)
-               drawpic(pos, "gfx/hud/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(pos, "gfx/hud/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(pos, "gfx/hud/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(pos, "gfx/hud/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(pos, "gfx/hud/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);
        }
@@ -2110,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 = "gfx/hud/sb_flag_red_taken"; break;
-               case 2: red_icon = "gfx/hud/sb_flag_red_lost"; break;
-               case 3: red_icon = "gfx/hud/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 = "gfx/hud/sb_flag_red_shielded";
+                               red_icon = "flag_red_shielded";
                        else
                                red_icon = string_null;
                        break;
        }
        switch(redflag_prevstatus) {
-               case 1: red_icon_prevstatus = "gfx/hud/sb_flag_red_taken"; break;
-               case 2: red_icon_prevstatus = "gfx/hud/sb_flag_red_lost"; break;
-               case 3: red_icon_prevstatus = "gfx/hud/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 = "gfx/hud/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 = "gfx/hud/sb_flag_red_shielded";
+                               red_icon_prevstatus = "flag_red_shielded";
                        else
                                red_icon_prevstatus = string_null;
                        break;
@@ -2138,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 = "gfx/hud/sb_flag_blue_taken"; break;
-               case 2: blue_icon = "gfx/hud/sb_flag_blue_lost"; break;
-               case 3: blue_icon = "gfx/hud/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 = "gfx/hud/sb_flag_blue_shielded";
+                               blue_icon = "flag_blue_shielded";
                        else
                                blue_icon = string_null;
                        break;
        }
        switch(blueflag_prevstatus) {
-               case 1: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_taken"; break;
-               case 2: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_lost"; break;
-               case 3: blue_icon_prevstatus = "gfx/hud/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 = "gfx/hud/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 = "gfx/hud/sb_flag_blue_shielded";
+                               blue_icon_prevstatus = "flag_blue_shielded";
                        else
                                blue_icon_prevstatus = string_null;
                        break;
@@ -2176,13 +2206,13 @@ void CSQC_ctf_hud(void)
        if(red_icon_prevstatus && f < 1)
                drawpic_expanding(redflag_pos, red_icon_prevstatus, sz, '1 1 1', hud_alpha_fg * red_alpha_prevstatus, DRAWFLAG_NORMAL, f);
        if(red_icon)
-               drawpic(redflag_pos, red_icon, sz, '1 1 1', hud_alpha_fg * red_alpha * f, DRAWFLAG_NORMAL);
+               drawpic_skin(redflag_pos, red_icon, sz, '1 1 1', hud_alpha_fg * red_alpha * f, DRAWFLAG_NORMAL);
 
        f = bound(0, blueflag_statuschange_elapsedtime*2, 1);
        if(blue_icon_prevstatus && f < 1)
                drawpic_expanding(blueflag_pos, blue_icon_prevstatus, sz, '1 1 1', hud_alpha_fg * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f);
        if(blue_icon)
-               drawpic(blueflag_pos, blue_icon, sz, '1 1 1', hud_alpha_fg * blue_alpha * f, DRAWFLAG_NORMAL);
+               drawpic_skin(blueflag_pos, blue_icon, sz, '1 1 1', hud_alpha_fg * blue_alpha * f, DRAWFLAG_NORMAL);
 }
 
 /*void HUD_Mod_Race (void) {
@@ -2226,18 +2256,18 @@ void CSQC_ctf_hud(void)
                        }
                        HUD_DrawXNum(bottomright - '0 48 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
                        HUD_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-                       drawpic(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "gfx/hud/num_dot", '16 16 0', distribution_color, hud_alpha_fg, DRAWFLAG_ADDITIVE);
+                       drawpic_skin(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "num_dot", '16 16 0', distribution_color, hud_alpha_fg, DRAWFLAG_ADDITIVE);
                }
                // race record display
                if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead
-                       drawpic(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "gfx/hud/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);
-               drawpic(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "gfx/hud/num_dot", '30 30 0', '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE);
+               drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "num_dot", '30 30 0', '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE);
 
                HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-               drawpic(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "gfx/hud/num_colon", '30 30 0', '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE);
+               drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "num_colon", '30 30 0', '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE);
        }
 }*/
 
@@ -2317,16 +2347,16 @@ void CSQC_kh_hud(void)
                        switch(keyteam)
                        {
                                case COLOR_TEAM1:
-                                       drawpic (pa, "gfx/hud/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, "gfx/hud/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, "gfx/hud/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, "gfx/hud/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;
@@ -2334,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, "gfx/hud/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, "gfx/hud/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, "gfx/hud/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, "gfx/hud/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;
                        }
                }
@@ -2400,7 +2430,7 @@ void CSQC_nb_hud(void)
        pos_y += 2; //vertical margin to the picture
 
        if (stat_items & IT_KEY1)
-               drawpic(pos, "gfx/hud/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
@@ -2529,9 +2559,9 @@ void HUD_Timer()
                minutes = min(minutes, 999);
                if(minutesLeft >= 1 || cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) {
                        if(minutes < 100)
-                               drawpic(pos + eX * mySize_x - eX * 5.1 * mySize_y, "gfx/hud/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(pos + eX * mySize_x - eX * 2.57 * mySize_y, "gfx/hud/num_colon", '1 1 0' * mySize_y, timer_color, 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);
                }
                HUD_DrawXNum(pos + eX * mySize_x - eX * 2 * mySize_y, seconds, -2, 0, mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
        }
@@ -2542,9 +2572,9 @@ void HUD_Timer()
                minutes = min(minutes, 99);
                if(minutesLeft >= 1 || cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) {
                        if(minutes < 100)
-                               drawpic(pos + eX * 0.5 * mySize_x - eX * 0.5 * 0.5 * mySize_y, "gfx/hud/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(pos + eX * 0.5 * mySize_x - eX * 0.5 * 0.5 * mySize_y + eY * 0.5 * mySize_y, "gfx/hud/num_colon", '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 + eY * 0.5 * mySize_y, "num_colon", '0.5 0.5 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL);
                }
                HUD_DrawXNum(pos + eX * 0.51 * mySize_x + eY * 0.5 * mySize_y, seconds, -2, 0, 0.5 * mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
        }
@@ -2665,8 +2695,8 @@ void HUD_Radar(void)
                frame_origin_y = pos_y - teamradar_size2d_y * 0.55859375; // matches the picture
                frame_size_x = pos_x * 1.1171875; // matches the picture
                frame_size_y = pos_y * 1.1171875; // matches the picture
-               drawpic(frame_origin, "gfx/ons-frame.tga", frame_size, '1 1 1', hud_alpha_fg, 0);
-               drawpic(frame_origin, "gfx/ons-frame-team.tga", frame_size, rgb, hud_alpha_fg, 0);
+               drawpic_skin(frame_origin, "gfx/ons-frame.tga", frame_size, '1 1 1', hud_alpha_fg, 0);
+               drawpic_skin(frame_origin, "gfx/ons-frame-team.tga", frame_size, rgb, hud_alpha_fg, 0);
 
                drawsetcliparea(
                        pos_x - teamradar_size2d_x * 0.5,
@@ -2708,13 +2738,13 @@ void HUD_DrawPressedKeys(void)
        float pressedkeys;
 
        pressedkeys = getstatf(STAT_PRESSED_KEYS);
-       drawpic(pos, "gfx/hud/keys/key_bg.tga",           mySize, '1 1 1', 0.1 * hud_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + eX * mySize_x - eX * 0.22 * mySize_x +       eY * 0.195 * mySize_y, ((pressedkeys & KEY_CROUCH) ? "gfx/hud/keys/key_crouch_inv.tga" : "gfx/hud/keys/key_crouch.tga"),        '1 1 0' * (1/3) * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.040 * mySize_y, ((pressedkeys & KEY_FORWARD) ? "gfx/hud/keys/key_forward_inv.tga" : "gfx/hud/keys/key_forward.tga"),     '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + eX * 0.023 * mySize_x +                      eY * 0.195 * mySize_y, ((pressedkeys & KEY_JUMP) ? "gfx/hud/keys/key_jump_inv.tga" : "gfx/hud/keys/key_jump.tga"),              '1 1 0' * (1/3) * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + eX * 0.1 * mySize_x +                        eY * 0.486 * mySize_y, ((pressedkeys & KEY_LEFT) ? "gfx/hud/keys/key_left_inv.tga" : "gfx/hud/keys/key_left.tga"),              '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.486 * mySize_y, ((pressedkeys & KEY_BACKWARD) ? "gfx/hud/keys/key_backward_inv.tga" : "gfx/hud/keys/key_backward.tga"),  '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + eX * mySize_x - eX * 0.372 * mySize_x +      eY * 0.486 * mySize_y, ((pressedkeys & KEY_RIGHT) ? "gfx/hud/keys/key_right_inv.tga" : "gfx/hud/keys/key_right.tga"),           '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+       drawpic_skin(pos, "keys/key_bg.tga",           mySize, '1 1 1', 0.1 * hud_alpha_fg, DRAWFLAG_NORMAL);
+       drawpic_skin(pos + eX * mySize_x - eX * 0.22 * mySize_x +       eY * 0.195 * mySize_y, ((pressedkeys & KEY_CROUCH) ? "keys/key_crouch_inv.tga" : "keys/key_crouch.tga"),        '1 1 0' * (1/3) * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+       drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.040 * mySize_y, ((pressedkeys & KEY_FORWARD) ? "keys/key_forward_inv.tga" : "keys/key_forward.tga"),     '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+       drawpic_skin(pos + eX * 0.023 * mySize_x +                      eY * 0.195 * mySize_y, ((pressedkeys & KEY_JUMP) ? "keys/key_jump_inv.tga" : "keys/key_jump.tga"),              '1 1 0' * (1/3) * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+       drawpic_skin(pos + eX * 0.1 * mySize_x +                        eY * 0.486 * mySize_y, ((pressedkeys & KEY_LEFT) ? "keys/key_left_inv.tga" : "keys/key_left.tga"),              '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+       drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.486 * mySize_y, ((pressedkeys & KEY_BACKWARD) ? "keys/key_backward_inv.tga" : "keys/key_backward.tga"),  '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+       drawpic_skin(pos + eX * mySize_x - eX * 0.372 * mySize_x +      eY * 0.486 * mySize_y, ((pressedkeys & KEY_RIGHT) ? "keys/key_right_inv.tga" : "keys/key_right.tga"),           '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
 }
 
 void HUD_ShowSpeed(void)
@@ -2808,9 +2838,9 @@ void HUD_ShowAcceleration(void)
        }
 
        if (acceleration > 0)
-               drawpic(pos, "gfx/hud/statusbar", acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawpic_skin(pos, "statusbar", acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
        else if (acceleration < 0)
-               drawpic(pos + acceleration * scale * '40 0 0', "gfx/hud/statusbar", -acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawpic_skin(pos + acceleration * scale * '40 0 0', "statusbar", -acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
 }
 
 void HUD_Reset (void)
@@ -2832,8 +2862,12 @@ void HUD_Main (void)
        hud_fontsize = HUD_GetFontsize("hud_fontsize");
        hud_fontsize_spec = HUD_GetFontsize("hud_fontsize_spec");
 
-       if(cvar_string("hud_dock") != "0")
-               drawpic('0 0 0', strcat("gfx/hud/", cvar_string("hud_dock")), eX * vid_conwidth + eY * vid_conheight, stov(cvar_string("hud_dock_color")), cvar("hud_dock_alpha"), DRAWFLAG_NORMAL);
+       hud_configure = cvar("_hud_configure");
+       hud_skin = cvar_string("hud_skin");
+
+       // Drawing stuff
+       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();
@@ -2854,13 +2888,13 @@ void HUD_Main (void)
        if(HUD_Panel_CheckActive(7))
                HUD_Score();
        if(HUD_Panel_CheckActive(8))
-               if(gametype == GAME_RACE || gametype == GAME_CTS || cvar("_hud_configure"))
+               if(gametype == GAME_RACE || gametype == GAME_CTS || hud_configure)
                        HUD_RaceTimer();
        if(HUD_Panel_CheckActive(9))
                HUD_VoteWindow();
        // TODO hud'ify
        if(HUD_Panel_CheckActive(10))
-               if(spectatee_status > 0 || cvar("cl_showpressedkeys") >= 2 || cvar("_hud_configure"))
+               if(spectatee_status > 0 || cvar("cl_showpressedkeys") >= 2 || hud_configure)
                        HUD_DrawPressedKeys();
 
        // TODO hud_'ify these
index 5aaa750790903a3291675bad6ab10d1dbc11b671..ca9198eec1eadba952b05f87f0e14e758b99f709 100644 (file)
@@ -1,3 +1,5 @@
+float panel_cnt = 11; // NOTE: IDs start from 0!
+
 void CSQC_kh_hudreset();
 void CSQC_kh_hud();
 void CSQC_ctf_hudreset();
@@ -24,3 +26,6 @@ float hud_hudselector;
 float hud_accuracy_hud;
 float hud_border_thickness;
 float hud_accuracy_border_thickness;
+
+string hud_skin;
+float hud_configure;
index 40b3c0ad34f26ded8d49a8db6ca6bc5154a8c01f..3f15a17843dad974019b9f1ae768a82a5dc079b2 100644 (file)
@@ -509,6 +509,3 @@ float WATERLEVEL_SWIMMING = 2;
 float WATERLEVEL_SUBMERGED = 3;
 
 float MAX_SHOT_DISTANCE = 32768;
-
-// panel hud constants
-float panel_cnt = 11; // NOTE: IDs start from 0!