From: FruitieX Date: Fri, 14 May 2010 15:38:22 +0000 (+0300) Subject: move files into gfx/hud/old/ X-Git-Tag: xonotic-v0.1.0preview~541^2~175 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68dfc57ff17009d5a819006d7d741e5a0c669f84;p=xonotic%2Fxonotic-data.pk3dir.git move files into gfx/hud/old/ --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 51c44df7a..b2f1e466d 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1329,7 +1329,7 @@ con_notifyalign 0 // hud variables set _hud_configure 0 "1 = configure the HUD" -seta hud_skin default "skin folder where to look for images" +seta hud_skin old "skin folder where to look for images" seta hud_accuracy_yellow 40 "percentage at which the accuracy color is yellow" seta hud_progressbar_alpha "0.5" "alpha of progressbars" seta hud_bg 0 "sets the default background for the panels, file must exist in data/gfx/hud/. 0 = disable background by default" @@ -1341,7 +1341,7 @@ seta hud_fg_alpha 1 "alpha of the foreground" seta hud_configure_checkcollisions 1 "check for collisions against other panels when in hud configure mode" seta hud_configure_bg_minalpha 0.5 "minimum panel background alpha when in hud configure mode" -seta hud_dock dock_oldhud "overlay the whole screen with this dock background, 0 = disable" +seta hud_dock 1 "enable/disable a fullscreen background for the hud, useful for creating artificial docks" seta hud_dock_color "0 0.6 0.9" "dock color" seta hud_dock_alpha 0.8 "alpha of the dock" diff --git a/gfx/hud/border_oldhud.tga b/gfx/hud/border_oldhud.tga deleted file mode 100644 index a3056c917..000000000 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 index 2b2865983..000000000 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 index b66500bbe..000000000 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 index 32f8e2047..000000000 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 index ae1811344..000000000 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 index a1f662e86..000000000 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 index b63c2d8f1..000000000 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 index 0a8cf7ed0..000000000 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 index 09da559dc..000000000 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 index 0a8cf7ed0..000000000 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 index 72ce48114..000000000 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 index 91a8ce451..000000000 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 index b800f0a6c..000000000 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 index 1a929671f..000000000 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 index 7523580fd..000000000 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 index 380315998..000000000 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 index bca989f5e..000000000 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 index 444247ffd..000000000 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 index 503dad91f..000000000 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 index 09da559dc..000000000 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 index 1a929671f..000000000 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 index b800f0a6c..000000000 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 index b90d687b3..000000000 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 index 91a8ce451..000000000 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 index 380315998..000000000 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 index b63c2d8f1..000000000 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 index a1f662e86..000000000 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 index b66500bbe..000000000 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 index ae1811344..000000000 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 index 7523580fd..000000000 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 index 444247ffd..000000000 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 index bca989f5e..000000000 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 index 0a8cf7ed0..000000000 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 index 32f8e2047..000000000 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 index ba59acaf1..000000000 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 index 72ce48114..000000000 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 index 4de0f3322..000000000 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 index bef0d1ca3..000000000 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 index fca30bed2..000000000 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 index 00b2dfe44..000000000 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 index 2cdbda804..000000000 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 index dfe223381..000000000 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 index 7bbea6070..000000000 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 index d02b2dbc8..000000000 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 index c54bb3763..000000000 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 index 60fe71f17..000000000 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 index 92bc615e4..000000000 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 index 308c03b1e..000000000 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 index 8f04be424..000000000 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 index f0ab2f18e..000000000 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 index e9c6e5bdc..000000000 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 index 78f1f45a3..000000000 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 index 1ff552f53..000000000 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 index 205dd0351..000000000 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 index 08d26dfef..000000000 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 index 335b5dab0..000000000 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 index a5fdddaa6..000000000 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 index 2b9f46f53..000000000 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 index fe879331f..000000000 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 index 8bb7043d4..000000000 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 index 3a6978a8c..000000000 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 index 1db8c0e0b..000000000 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 index f64e178bf..000000000 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 index 0099d684d..000000000 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 index 252e796d8..000000000 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 index aa20157a7..000000000 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 index e2cd39dec..000000000 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 index 87b9c21c1..000000000 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 index 5a8d6103c..000000000 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 index e22c09a69..000000000 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 index 68ad28ad5..000000000 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 index 7fbfdd041..000000000 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 index 29ad696ac..000000000 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 index 10721f2d8..000000000 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 index 26455a0ad..000000000 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 index 3cb17b3e4..000000000 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 index 7df2faaeb..000000000 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 index 000000000..2974c1d0c 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 index 000000000..96e853d70 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 index 000000000..7f3a2af35 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 index 000000000..4801835a5 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 index 000000000..a3056c917 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 index 000000000..394fa05ff 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 index 000000000..536531480 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 index 000000000..2b2865983 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 index 000000000..a8d64d1ac 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 index 000000000..5c7e632dc 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 index 000000000..5da93569a 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 index 000000000..e6d955fa9 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 index 000000000..d1cf43d38 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 index 000000000..b9d060d85 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 index 000000000..551ba613b 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 index 000000000..7a1d3fc00 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 index 000000000..d76156863 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 index 000000000..1fd71d893 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 index 000000000..0e5233ca3 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 index 000000000..0629e499e 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 index 000000000..a6fb924a6 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 index 000000000..ec54137bd 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 index 000000000..4de0f3322 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 index 000000000..bef0d1ca3 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 index 000000000..fca30bed2 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 index 000000000..00b2dfe44 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 index 000000000..2cdbda804 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 index 000000000..dfe223381 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 index 000000000..7bbea6070 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 index 000000000..d02b2dbc8 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 index 000000000..c54bb3763 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 index 000000000..60fe71f17 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 index 000000000..92bc615e4 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 index 000000000..308c03b1e 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 index 000000000..8f04be424 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 index 000000000..467b2294f 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 index 000000000..b686d1b34 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 index 000000000..b40967a75 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 index 000000000..17427e5d3 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 index 000000000..3201f8afe 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 index 000000000..edd1fab3c 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 index 000000000..bb8347563 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 index 000000000..8e754cc9b 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 index 000000000..58d66f773 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 index 000000000..f0ab2f18e 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 index 000000000..e9c6e5bdc 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 index 000000000..78f1f45a3 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 index 000000000..1ff552f53 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 index 000000000..205dd0351 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 index 000000000..08d26dfef 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 index 000000000..335b5dab0 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 index 000000000..a5fdddaa6 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 index 000000000..2b9f46f53 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 index 000000000..fe879331f 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 index 000000000..8bb7043d4 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 index 000000000..3a6978a8c 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 index 000000000..1db8c0e0b 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 index 000000000..f64e178bf 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 index 000000000..0099d684d 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 index 000000000..252e796d8 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 index 000000000..aa20157a7 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 index 000000000..e2cd39dec 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 index 000000000..87b9c21c1 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 index 000000000..5a8d6103c 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 index 000000000..e22c09a69 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 index 000000000..68ad28ad5 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 index 000000000..7fbfdd041 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 index 000000000..29ad696ac 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 index 000000000..10721f2d8 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 index 000000000..26455a0ad 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 index 000000000..3cb17b3e4 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 index 000000000..7df2faaeb 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 index 000000000..cd1164bdf 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 index 000000000..c8fa1577c 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 index 000000000..0af3c593f 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 index 000000000..aa8bae1a8 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 index 000000000..c9647b927 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 index 000000000..a90927cac 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 index 000000000..6f6ca4c9c 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 index 000000000..68f6df7ff 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 index 000000000..0a5db15dc 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 index 000000000..d5cc95b93 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 index 000000000..4a126e7fe 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 index 000000000..846212b06 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 index 000000000..137e24d1d 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 index 000000000..e2b4df2fa 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 index 000000000..f93ea6018 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 index 000000000..1d9ea76c4 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 index 000000000..e43040f60 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 index 000000000..24e5c726b 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 index 000000000..f13f0b4d8 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 index 000000000..0bbad1787 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 index 000000000..b19019d5d 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 index 000000000..4d7ec70af 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 index 000000000..52ceaa9e6 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 index 000000000..10ffa1374 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 index 000000000..9f3f61487 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 index 000000000..a21fe6a4b 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 index 000000000..b66500bbe 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 index 000000000..32f8e2047 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 index 000000000..ae1811344 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 index 000000000..a1f662e86 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 index 000000000..b63c2d8f1 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 index 000000000..0a8cf7ed0 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 index 000000000..09da559dc 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 index 000000000..0a8cf7ed0 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 index 000000000..72ce48114 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 index 000000000..91a8ce451 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 index 000000000..b800f0a6c 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 index 000000000..1a929671f 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 index 000000000..7523580fd 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 index 000000000..380315998 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 index 000000000..bca989f5e 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 index 000000000..444247ffd 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 index 000000000..503dad91f 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 index 000000000..09da559dc 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 index 000000000..1a929671f 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 index 000000000..b800f0a6c 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 index 000000000..b90d687b3 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 index 000000000..91a8ce451 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 index 000000000..380315998 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 index 000000000..b63c2d8f1 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 index 000000000..a1f662e86 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 index 000000000..b66500bbe 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 index 000000000..ae1811344 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 index 000000000..7523580fd 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 index 000000000..444247ffd 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 index 000000000..bca989f5e 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 index 000000000..0a8cf7ed0 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 index 000000000..32f8e2047 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 index 000000000..ba59acaf1 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 index 000000000..72ce48114 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 index cd1164bdf..000000000 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 index c8fa1577c..000000000 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 index 0af3c593f..000000000 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 index aa8bae1a8..000000000 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 index c9647b927..000000000 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 index a90927cac..000000000 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 index 6f6ca4c9c..000000000 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 index 68f6df7ff..000000000 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 index 0a5db15dc..000000000 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 index d5cc95b93..000000000 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 index 4a126e7fe..000000000 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 index 846212b06..000000000 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 index 137e24d1d..000000000 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 index 2974c1d0c..000000000 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 index 96e853d70..000000000 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 index 7f3a2af35..000000000 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 index 4801835a5..000000000 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 index 394fa05ff..000000000 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 index 536531480..000000000 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 index a8d64d1ac..000000000 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 index 5c7e632dc..000000000 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 index 5da93569a..000000000 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 index e6d955fa9..000000000 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 index d1cf43d38..000000000 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 index b9d060d85..000000000 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 index 551ba613b..000000000 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 index 7a1d3fc00..000000000 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 index d76156863..000000000 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 index 1fd71d893..000000000 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 index 0e5233ca3..000000000 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 index 0629e499e..000000000 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 index a6fb924a6..000000000 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 index ec54137bd..000000000 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 index 467b2294f..000000000 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 index b686d1b34..000000000 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 index b40967a75..000000000 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 index 17427e5d3..000000000 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 index 3201f8afe..000000000 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 index edd1fab3c..000000000 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 index bb8347563..000000000 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 index 8e754cc9b..000000000 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 index 58d66f773..000000000 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 index e2b4df2fa..000000000 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 index 1d9ea76c4..000000000 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 index e43040f60..000000000 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 index 24e5c726b..000000000 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 index f13f0b4d8..000000000 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 index b19019d5d..000000000 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 index 4d7ec70af..000000000 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 index 52ceaa9e6..000000000 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 index f93ea6018..000000000 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 index 0bbad1787..000000000 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 index 10ffa1374..000000000 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 index 9f3f61487..000000000 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 index a21fe6a4b..000000000 Binary files a/gfx/hud/voteprogress_voted.tga and /dev/null differ diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 70ee6a757..e50776bda 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -77,7 +77,7 @@ void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector the // draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga void drawpic_skin(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) { - drawpic_skin(pos, strcat("gfx/hud/", hud_skin, "/", pic), sz, color, alpha, drawflag); + drawpic(pos, strcat("gfx/hud/", hud_skin, "/", pic), sz, color, alpha, drawflag); } // return HUD background color @@ -177,7 +177,7 @@ void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float le hl_pos_y = pos_y - lettersize/20; hl_pos_z = 0; - drawpic_skin(hl_pos, strcat("sb_highlight_", l_length), hl_size, '1 1 1', alpha, dflags); + drawpic_skin(hl_pos, strcat("highlight_", l_length), hl_size, '1 1 1', alpha, dflags); } if (stroke == 1) @@ -1146,8 +1146,8 @@ void HUD_WeaponIcons() weapon_damage = weapon_fired[self.weapon-WEP_FIRST]; if(self.weapon == activeweapon) - drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "sb_ammobg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("inv_weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "ammobg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * hud_alpha_fg, DRAWFLAG_NORMAL); if(cvar_or("hud_weaponicons_number", 1)) drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), ftos(id), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); @@ -1160,7 +1160,7 @@ void HUD_WeaponIcons() accuracy_color = HUD_AccuracyColor(weapon_stats); if(weapon_damage) - drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) - '2 0 0' + eY * (mySize_y/rows - accuracybar_height), "sb_accuracy_bar.tga", eX * mySize_x*(1/columns) + eY * accuracybar_height, accuracy_color, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) - '2 0 0' + eY * (mySize_y/rows - accuracybar_height), "accuracy_bar.tga", eX * mySize_x*(1/columns) + eY * accuracybar_height, accuracy_color, hud_alpha_fg, DRAWFLAG_NORMAL); } } @@ -1207,11 +1207,11 @@ string GetAmmoPicture(float i) { switch(i) { - case 0: return "sb_shells"; - case 1: return "sb_bullets"; - case 2: return "sb_rocket"; - case 3: return "sb_cells"; - case 4: return "sb_fuel"; + case 0: return "shells"; + case 1: return "bullets"; + case 2: return "rocket"; + case 3: return "cells"; + case 4: return "fuel"; default: return ""; } } @@ -1237,7 +1237,7 @@ void HUD_Inventory() if(cvar("hud_inventory_onlycurrent")) { if (stat_items & GetAmmoItemCode(i)) { - drawpic_skin(pos, "sb_ammobg", mySize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos, "ammobg", mySize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); drawpic_skin(pos + eY * 0.05 * mySize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); if(a < 10) HUD_DrawXNum(pos + eX * 0.8 * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); @@ -1276,7 +1276,7 @@ void HUD_Inventory() } if (stat_items & GetAmmoItemCode(i)) - drawpic_skin(mypos, "sb_ammobg", mysize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(mypos, "ammobg", mysize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); drawpic_skin(mypos + eY * 0.05 * mysize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mysize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); if (a < 10) { if(stat_items & GetAmmoItemCode(i)) @@ -1356,14 +1356,14 @@ void HUD_Powerups() { len = strlen(ftos(leftcnt)); drawpic_skin(pos, "statusbar", eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos, strcat("sb_", leftname), '1 1 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos, strcat("", leftname), '1 1 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * mySize_y + eY * 0.25 * mySize_y, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } if(rightcnt) { drawpic_skin(pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/30), "statusbar", eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * mySize_y, strcat("sb_", rightname), '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * mySize_y, strcat("", rightname), '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * mySize_x - eX * 2.5 * mySize_y + eY * 0.25 * mySize_y, rightcnt, 3, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } } @@ -1374,7 +1374,7 @@ void HUD_Powerups() { len = strlen(ftos(leftcnt)); drawpic_skin(pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/30), "statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30), HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.4 * mySize_y, strcat("sb_", leftname), '0.7 0.7 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * 0.4 * mySize_y, strcat("", leftname), '0.7 0.7 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * ((3-len)/2) * 0.5 * mySize_y + eY * 0.55 * mySize_y, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } @@ -1383,7 +1383,7 @@ void HUD_Powerups() { len = strlen(ftos(rightcnt)); drawpic_skin(pos + eX * 0.5 * mySize_x + eY * mySize_y - eY * mySize_y * min(1, rightcnt/30), "statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30), HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * 1.1 * mySize_y, strcat("sb_", rightname), '0.7 0.7 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * 1.1 * mySize_y, strcat("", rightname), '0.7 0.7 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * mySize_x - eX * len * 0.5 * mySize_y - eX * ((3-len)/2) * 0.5 * mySize_y + eY * 0.55 * mySize_y, rightcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } } @@ -1394,7 +1394,7 @@ void HUD_Powerups() { len = strlen(ftos(leftcnt)); drawpic_skin(pos, "statusbar", eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos, strcat("sb_", leftname), '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos, strcat("", leftname), '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * 0.5 * mySize_y, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } @@ -1403,7 +1403,7 @@ void HUD_Powerups() { len = strlen(ftos(rightcnt)); drawpic_skin(pos + eY * 0.5 * mySize_y, "statusbar", eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eY * 0.5 * mySize_y, strcat("sb_", rightname), '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eY * 0.5 * mySize_y, strcat("", rightname), '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * 0.5 * mySize_y + eY * 0.5 * mySize_y, rightcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } } @@ -1416,18 +1416,18 @@ void HUD_Powerups() { { if(dt < 5) { - drawpic_expanding_two(pos, "sb_str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, + drawpic_expanding_two(pos, "str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, bound(0, (ceil(dt) - dt) / 0.5, 1)); } else { - drawpic_skin(pos, "sb_str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE); + drawpic_skin(pos, "str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE); } HUD_DrawXNum(pos - '40 -2 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } else if(dt > -1) { - drawpic_expanding(pos, "sb_str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, + drawpic_expanding(pos, "str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, bound(0, -dt / 0.5, 1)); } } @@ -1439,18 +1439,18 @@ void HUD_Powerups() { { if(dt < 5) { - drawpic_expanding_two(pos - '0 -22 0', "sb_invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, + drawpic_expanding_two(pos - '0 -22 0', "invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, bound(0, (ceil(dt) - dt) / 0.5, 1)); } else { - drawpic_skin(pos - '0 -22 0', "sb_invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE); + drawpic_skin(pos - '0 -22 0', "invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE); } HUD_DrawXNum(pos - '40 -24 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } else if(dt > -1) { - drawpic_expanding(pos - '0 -22 0', "sb_invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, + drawpic_expanding(pos - '0 -22 0', "invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE, bound(0, -dt / 0.5, 1)); } } @@ -1495,13 +1495,13 @@ void HUD_HealthArmor(void) if(v_z) // fully armored { // here, armorideal > armor - drawpic_skin(num_pos + '78 -4.5 0', "sb_health", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - drawpic_skin(num_pos + '108 -4.5 0', "sb_armor", '20 20 0', '1 1 1', hud_alpha_fg * armor / v_y, DRAWFLAG_NORMAL); + drawpic_skin(num_pos + '78 -4.5 0', "health", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(num_pos + '108 -4.5 0', "armor", '20 20 0', '1 1 1', hud_alpha_fg * armor / v_y, DRAWFLAG_NORMAL); } else { - drawpic_skin(num_pos + '108 -4.5 0', "sb_health", '20 20 0', '1 1 1', hud_alpha_fg * v_y / armor, DRAWFLAG_NORMAL); - drawpic_skin(num_pos + '78 -4.5 0', "sb_armor", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(num_pos + '108 -4.5 0', "health", '20 20 0', '1 1 1', hud_alpha_fg * v_y / armor, DRAWFLAG_NORMAL); + drawpic_skin(num_pos + '78 -4.5 0', "armor", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); } HUD_DrawXNum_Colored(num_pos, x, 3, 24, hud_alpha_fg); // draw the combined health and armor } @@ -1547,14 +1547,14 @@ void HUD_HealthArmor(void) len = strlen(ftos(leftcnt)); drawpic_skin(pos, "statusbar", eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos, strcat("sb_", leftname), '1 1 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos, strcat("", leftname), '1 1 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum_Colored(pos + eX * mySize_y + eY * 0.25 * mySize_y, leftcnt, len, 0.5 * mySize_y, hud_alpha_fg); } if(rightactive) { drawpic_skin(pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/200), "statusbar", eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * mySize_y, strcat("sb_", rightname), '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * mySize_y, strcat("", rightname), '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * 2.5 * mySize_y + eY * 0.25 * mySize_y, rightcnt, 3, 0.5 * mySize_y, hud_alpha_fg); } @@ -1568,7 +1568,7 @@ void HUD_HealthArmor(void) len = strlen(ftos(leftcnt)); drawpic_skin(pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200), "statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200), HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.4 * mySize_y, strcat("sb_", leftname), '0.7 0.7 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * 0.4 * mySize_y, strcat("", leftname), '0.7 0.7 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum_Colored(pos + eX * ((3-len)/2) * 0.5 * mySize_y + eY * 0.55 * mySize_y, leftcnt, len, 0.5 * mySize_y, hud_alpha_fg); } @@ -1577,7 +1577,7 @@ void HUD_HealthArmor(void) len = strlen(ftos(rightcnt)); drawpic_skin(pos + eX * 0.5 * mySize_x + eY * mySize_y - eY * mySize_y * min(1, rightcnt/200), "statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200), HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * 1.1 * mySize_y, strcat("sb_", rightname), '0.7 0.7 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * 1.1 * mySize_y, strcat("", rightname), '0.7 0.7 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * len * 0.5 * mySize_y - eX * ((3-len)/2) * 0.5 * mySize_y + eY * 0.55 * mySize_y, rightcnt, len, 0.5 * mySize_y, hud_alpha_fg); } @@ -1591,7 +1591,7 @@ void HUD_HealthArmor(void) len = strlen(ftos(leftcnt)); drawpic_skin(pos, "statusbar", eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos, strcat("sb_", leftname), '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos, strcat("", leftname), '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum_Colored(pos + eX * 0.5 * mySize_y, leftcnt, len, 0.5 * mySize_y, hud_alpha_fg); } @@ -1600,7 +1600,7 @@ void HUD_HealthArmor(void) len = strlen(ftos(rightcnt)); drawpic_skin(pos + eY * 0.5 * mySize_y, "statusbar", eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL); - drawpic_skin(pos + eY * 0.5 * mySize_y, strcat("sb_", rightname), '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eY * 0.5 * mySize_y, strcat("", rightname), '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum_Colored(pos + eX * 0.5 * mySize_y + eY * 0.5 * mySize_y, rightcnt, len, 0.5 * mySize_y, hud_alpha_fg); } @@ -1659,7 +1659,7 @@ void HUD_Score() HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y, distribution, 3, 3, 0.33 * mySize_y, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); if (leader) - drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("sb_highlight_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("highlight_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } else { // teamgames float max_fragcount; @@ -1683,13 +1683,13 @@ void HUD_Score() if (max_fragcount == score) leader = 1; if (leader) - drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("sb_highlight_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("highlight_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); } else { if (max_fragcount == score) leader = 1; if (leader) - drawpic_skin(pos + eX * mySize_x - eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y * teamnum, strcat("sb_highlight_", ftos(score_len)), eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y * teamnum, strcat("highlight_", ftos(score_len)), eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y + eY * 0.33 * mySize_y * teamnum, score, 3, 0, 0.33 * mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); teamnum += 1; } @@ -2054,20 +2054,20 @@ void HUD_DrawRaceStatus(vector pos) rankname = race_PlaceName(rank); if(race_status == 0) - drawpic_skin(pos, "race/newfail", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newfail", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); else if(race_status == 1) { - drawpic_skin(pos, "race/newtime", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newtime", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', hud_alpha_fg * a, DRAWFLAG_NORMAL); drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); } else if(race_status == 2) { if(race_status_name == GetPlayerName(player_localentnum -1) || !race_myrank || race_myrank < rank) - drawpic_skin(pos, "race/newrankgreen", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newrankgreen", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); else - drawpic_skin(pos, "race/newrankyellow", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newrankyellow", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', hud_alpha_fg * a, DRAWFLAG_NORMAL); drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); } else if(race_status == 3) { - drawpic_skin(pos, "race/newrecordserver", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); + drawpic_skin(pos, "race_newrecordserver", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', hud_alpha_fg * a, DRAWFLAG_NORMAL); drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL); } @@ -2140,25 +2140,25 @@ void CSQC_ctf_hud(void) float red_alpha, red_alpha_prevstatus; red_alpha = red_alpha_prevstatus = 1; switch(redflag) { - case 1: red_icon = "sb_flag_red_taken"; break; - case 2: red_icon = "sb_flag_red_lost"; break; - case 3: red_icon = "sb_flag_red_carrying"; red_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; + case 1: red_icon = "flag_red_taken"; break; + case 2: red_icon = "flag_red_lost"; break; + case 3: red_icon = "flag_red_carrying"; red_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; default: if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2)) - red_icon = "sb_flag_red_shielded"; + red_icon = "flag_red_shielded"; else red_icon = string_null; break; } switch(redflag_prevstatus) { - case 1: red_icon_prevstatus = "sb_flag_red_taken"; break; - case 2: red_icon_prevstatus = "sb_flag_red_lost"; break; - case 3: red_icon_prevstatus = "sb_flag_red_carrying"; red_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; + case 1: red_icon_prevstatus = "flag_red_taken"; break; + case 2: red_icon_prevstatus = "flag_red_lost"; break; + case 3: red_icon_prevstatus = "flag_red_carrying"; red_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; default: if(redflag == 3) - red_icon_prevstatus = "sb_flag_red_carrying"; // make it more visible + red_icon_prevstatus = "flag_red_carrying"; // make it more visible else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2)) - red_icon_prevstatus = "sb_flag_red_shielded"; + red_icon_prevstatus = "flag_red_shielded"; else red_icon_prevstatus = string_null; break; @@ -2168,25 +2168,25 @@ void CSQC_ctf_hud(void) float blue_alpha, blue_alpha_prevstatus; blue_alpha = blue_alpha_prevstatus = 1; switch(blueflag) { - case 1: blue_icon = "sb_flag_blue_taken"; break; - case 2: blue_icon = "sb_flag_blue_lost"; break; - case 3: blue_icon = "sb_flag_blue_carrying"; blue_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; + case 1: blue_icon = "flag_blue_taken"; break; + case 2: blue_icon = "flag_blue_lost"; break; + case 3: blue_icon = "flag_blue_carrying"; blue_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; default: if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1)) - blue_icon = "sb_flag_blue_shielded"; + blue_icon = "flag_blue_shielded"; else blue_icon = string_null; break; } switch(blueflag_prevstatus) { - case 1: blue_icon_prevstatus = "sb_flag_blue_taken"; break; - case 2: blue_icon_prevstatus = "sb_flag_blue_lost"; break; - case 3: blue_icon_prevstatus = "sb_flag_blue_carrying"; blue_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; + case 1: blue_icon_prevstatus = "flag_blue_taken"; break; + case 2: blue_icon_prevstatus = "flag_blue_lost"; break; + case 3: blue_icon_prevstatus = "flag_blue_carrying"; blue_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; default: if(blueflag == 3) - blue_icon_prevstatus = "sb_flag_blue_carrying"; // make it more visible + blue_icon_prevstatus = "flag_blue_carrying"; // make it more visible else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1)) - blue_icon_prevstatus = "sb_flag_blue_shielded"; + blue_icon_prevstatus = "flag_blue_shielded"; else blue_icon_prevstatus = string_null; break; @@ -2260,7 +2260,7 @@ void CSQC_ctf_hud(void) } // race record display if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead - drawpic_skin(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "sb_highlight_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "highlight_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); @@ -2347,16 +2347,16 @@ void CSQC_kh_hud(void) switch(keyteam) { case COLOR_TEAM1: - drawpic (pa, "sb_kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (pa, "kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; case COLOR_TEAM2: - drawpic (pa, "sb_kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (pa, "kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; case COLOR_TEAM3: - drawpic (pa, "sb_kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (pa, "kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; case COLOR_TEAM4: - drawpic (pa, "sb_kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (pa, "kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; default: break; @@ -2364,16 +2364,16 @@ void CSQC_kh_hud(void) switch(i) // YAY! switch(i) inside a for loop for i. DailyWTF, here we come! { case 0: - drawpic (p, "sb_kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (p, "kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; case 1: - drawpic (p, "sb_kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (p, "kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; case 2: - drawpic (p, "sb_kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (p, "kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; case 3: - drawpic (p, "sb_kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic (p, "kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; } } @@ -2430,7 +2430,7 @@ void CSQC_nb_hud(void) pos_y += 2; //vertical margin to the picture if (stat_items & IT_KEY1) - drawpic_skin(pos, "sb_nexball_carrying", '80 34 0', '1 1 1', 1, DRAWFLAG_NORMAL); + drawpic_skin(pos, "nexball_carrying", '80 34 0', '1 1 1', 1, DRAWFLAG_NORMAL); } // Race/CTS HUD modicon section @@ -2559,7 +2559,7 @@ void HUD_Timer() minutes = min(minutes, 999); if(minutesLeft >= 1 || cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) { if(minutes < 100) - drawpic_skin(pos + eX * mySize_x - eX * 5.1 * mySize_y, "sb_timer", '1 1 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x - eX * 5.1 * mySize_y, "timer", '1 1 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * mySize_x - eX * 5.1 * mySize_y, minutes, 3, 0, mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); drawpic_skin(pos + eX * mySize_x - eX * 2.57 * mySize_y, "num_colon", '1 1 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL); } @@ -2572,7 +2572,7 @@ void HUD_Timer() minutes = min(minutes, 99); if(minutesLeft >= 1 || cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) { if(minutes < 100) - drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.5 * 0.5 * mySize_y, "sb_timer", '0.5 0.5 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.5 * 0.5 * mySize_y, "timer", '0.5 0.5 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL); HUD_DrawXNum(pos + eX * 0.5 * mySize_x - eX * mySize_y + eY * 0.5 * mySize_y, minutes, -2, 0, 0.5 * mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.5 * 0.5 * mySize_y + eY * 0.5 * mySize_y, "num_colon", '0.5 0.5 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL); } @@ -2880,8 +2880,8 @@ void HUD_Main (void) hud_skin = cvar_string("hud_skin"); // Drawing stuff - if(cvar_string("hud_dock") != "0") - drawpic_skin('0 0 0', strcat("", cvar_string("hud_dock")), eX * vid_conwidth + eY * vid_conheight, stov(cvar_string("hud_dock_color")), cvar("hud_dock_alpha"), DRAWFLAG_NORMAL); + if(cvar("hud_dock")) + drawpic_skin('0 0 0', "dock", eX * vid_conwidth + eY * vid_conheight, stov(cvar_string("hud_dock_color")), cvar("hud_dock_alpha"), DRAWFLAG_NORMAL); if(HUD_Panel_CheckActive(0)) HUD_WeaponIcons();