From: FruitieX Date: Fri, 14 May 2010 17:15:08 +0000 (+0300) Subject: impose some order on the files in gfx/ X-Git-Tag: xonotic-v0.1.0preview~541^2~165 X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=b5201ddea68633a57e5a9bc266ff270550ecef57;p=xonotic%2Fxonotic-data.pk3dir.git impose some order on the files in gfx/ --- diff --git a/gfx/hud/old/accuracy.tga b/gfx/hud/old/accuracy.tga deleted file mode 100644 index 2974c1d0c..000000000 Binary files a/gfx/hud/old/accuracy.tga and /dev/null differ diff --git a/gfx/hud/old/ammo_fuel.tga b/gfx/hud/old/ammo_fuel.tga new file mode 100644 index 000000000..d76156863 Binary files /dev/null and b/gfx/hud/old/ammo_fuel.tga differ diff --git a/gfx/hud/old/ammobg.tga b/gfx/hud/old/ammobg.tga deleted file mode 100644 index 7f3a2af35..000000000 Binary files a/gfx/hud/old/ammobg.tga and /dev/null differ diff --git a/gfx/hud/old/bullets.tga b/gfx/hud/old/bullets.tga deleted file mode 100644 index 394fa05ff..000000000 Binary files a/gfx/hud/old/bullets.tga and /dev/null differ diff --git a/gfx/hud/old/cells.tga b/gfx/hud/old/cells.tga deleted file mode 100644 index 536531480..000000000 Binary files a/gfx/hud/old/cells.tga and /dev/null differ diff --git a/gfx/hud/old/fuel.tga b/gfx/hud/old/fuel.tga deleted file mode 100644 index d76156863..000000000 Binary files a/gfx/hud/old/fuel.tga and /dev/null differ diff --git a/gfx/hud/old/rocket.tga b/gfx/hud/old/rocket.tga deleted file mode 100644 index e2b4df2fa..000000000 Binary files a/gfx/hud/old/rocket.tga and /dev/null differ diff --git a/gfx/hud/old/sbar.tga b/gfx/hud/old/sbar.tga deleted file mode 100644 index f93ea6018..000000000 Binary files a/gfx/hud/old/sbar.tga and /dev/null differ diff --git a/gfx/hud/old/scoreboard_bg.tga b/gfx/hud/old/scoreboard_bg.tga deleted file mode 100644 index 1d9ea76c4..000000000 Binary files a/gfx/hud/old/scoreboard_bg.tga and /dev/null differ diff --git a/gfx/hud/old/scoreboard_tableheader.tga b/gfx/hud/old/scoreboard_tableheader.tga deleted file mode 100644 index e43040f60..000000000 Binary files a/gfx/hud/old/scoreboard_tableheader.tga and /dev/null differ diff --git a/gfx/hud/old/shells.tga b/gfx/hud/old/shells.tga deleted file mode 100644 index 24e5c726b..000000000 Binary files a/gfx/hud/old/shells.tga and /dev/null differ diff --git a/gfx/hud/old/timerbg.tga b/gfx/hud/old/timerbg.tga deleted file mode 100644 index 52ceaa9e6..000000000 Binary files a/gfx/hud/old/timerbg.tga and /dev/null differ diff --git a/gfx/hud/old/weapon0.tga b/gfx/hud/old/weapon0.tga deleted file mode 100644 index b66500bbe..000000000 Binary files a/gfx/hud/old/weapon0.tga and /dev/null differ diff --git a/gfx/hud/old/weapon1.tga b/gfx/hud/old/weapon1.tga deleted file mode 100644 index 32f8e2047..000000000 Binary files a/gfx/hud/old/weapon1.tga and /dev/null differ diff --git a/gfx/hud/old/weapon10.tga b/gfx/hud/old/weapon10.tga deleted file mode 100644 index ae1811344..000000000 Binary files a/gfx/hud/old/weapon10.tga and /dev/null differ diff --git a/gfx/hud/old/weapon11.tga b/gfx/hud/old/weapon11.tga deleted file mode 100644 index a1f662e86..000000000 Binary files a/gfx/hud/old/weapon11.tga and /dev/null differ diff --git a/gfx/hud/old/weapon12.tga b/gfx/hud/old/weapon12.tga deleted file mode 100644 index b63c2d8f1..000000000 Binary files a/gfx/hud/old/weapon12.tga and /dev/null differ diff --git a/gfx/hud/old/weapon13.tga b/gfx/hud/old/weapon13.tga deleted file mode 100644 index 0a8cf7ed0..000000000 Binary files a/gfx/hud/old/weapon13.tga and /dev/null differ diff --git a/gfx/hud/old/weapon14.tga b/gfx/hud/old/weapon14.tga deleted file mode 100644 index 09da559dc..000000000 Binary files a/gfx/hud/old/weapon14.tga and /dev/null differ diff --git a/gfx/hud/old/weapon15.tga b/gfx/hud/old/weapon15.tga deleted file mode 100644 index 0a8cf7ed0..000000000 Binary files a/gfx/hud/old/weapon15.tga and /dev/null differ diff --git a/gfx/hud/old/weapon2.tga b/gfx/hud/old/weapon2.tga deleted file mode 100644 index 72ce48114..000000000 Binary files a/gfx/hud/old/weapon2.tga and /dev/null differ diff --git a/gfx/hud/old/weapon3.tga b/gfx/hud/old/weapon3.tga deleted file mode 100644 index 91a8ce451..000000000 Binary files a/gfx/hud/old/weapon3.tga and /dev/null differ diff --git a/gfx/hud/old/weapon4.tga b/gfx/hud/old/weapon4.tga deleted file mode 100644 index b800f0a6c..000000000 Binary files a/gfx/hud/old/weapon4.tga and /dev/null differ diff --git a/gfx/hud/old/weapon5.tga b/gfx/hud/old/weapon5.tga deleted file mode 100644 index 1a929671f..000000000 Binary files a/gfx/hud/old/weapon5.tga and /dev/null differ diff --git a/gfx/hud/old/weapon6.tga b/gfx/hud/old/weapon6.tga deleted file mode 100644 index 7523580fd..000000000 Binary files a/gfx/hud/old/weapon6.tga and /dev/null differ diff --git a/gfx/hud/old/weapon7.tga b/gfx/hud/old/weapon7.tga deleted file mode 100644 index 380315998..000000000 Binary files a/gfx/hud/old/weapon7.tga and /dev/null differ diff --git a/gfx/hud/old/weapon8.tga b/gfx/hud/old/weapon8.tga deleted file mode 100644 index bca989f5e..000000000 Binary files a/gfx/hud/old/weapon8.tga and /dev/null differ diff --git a/gfx/hud/old/weapon9.tga b/gfx/hud/old/weapon9.tga deleted file mode 100644 index 444247ffd..000000000 Binary files a/gfx/hud/old/weapon9.tga and /dev/null differ diff --git a/gfx/hud/old/weapon_current_bg.tga b/gfx/hud/old/weapon_current_bg.tga new file mode 100644 index 000000000..7f3a2af35 Binary files /dev/null and b/gfx/hud/old/weapon_current_bg.tga differ diff --git a/gfx/hud/old/weapon_hlacmod_renameit.tga b/gfx/hud/old/weapon_hlacmod_renameit.tga deleted file mode 100644 index 503dad91f..000000000 Binary files a/gfx/hud/old/weapon_hlacmod_renameit.tga and /dev/null differ diff --git a/gfx/hud/old/weaponcampingrifle.tga b/gfx/hud/old/weaponcampingrifle.tga deleted file mode 100644 index 09da559dc..000000000 Binary files a/gfx/hud/old/weaponcampingrifle.tga and /dev/null differ diff --git a/gfx/hud/old/weaponcrylink.tga b/gfx/hud/old/weaponcrylink.tga deleted file mode 100644 index 1a929671f..000000000 Binary files a/gfx/hud/old/weaponcrylink.tga and /dev/null differ diff --git a/gfx/hud/old/weaponelectro.tga b/gfx/hud/old/weaponelectro.tga deleted file mode 100644 index b800f0a6c..000000000 Binary files a/gfx/hud/old/weaponelectro.tga and /dev/null differ diff --git a/gfx/hud/old/weaponfireball.tga b/gfx/hud/old/weaponfireball.tga deleted file mode 100644 index b90d687b3..000000000 Binary files a/gfx/hud/old/weaponfireball.tga and /dev/null differ diff --git a/gfx/hud/old/weapongrenadelauncher.tga b/gfx/hud/old/weapongrenadelauncher.tga deleted file mode 100644 index 91a8ce451..000000000 Binary files a/gfx/hud/old/weapongrenadelauncher.tga and /dev/null differ diff --git a/gfx/hud/old/weaponhagar.tga b/gfx/hud/old/weaponhagar.tga deleted file mode 100644 index 380315998..000000000 Binary files a/gfx/hud/old/weaponhagar.tga and /dev/null differ diff --git a/gfx/hud/old/weaponhlac.tga b/gfx/hud/old/weaponhlac.tga deleted file mode 100644 index b63c2d8f1..000000000 Binary files a/gfx/hud/old/weaponhlac.tga and /dev/null differ diff --git a/gfx/hud/old/weaponhook.tga b/gfx/hud/old/weaponhook.tga deleted file mode 100644 index a1f662e86..000000000 Binary files a/gfx/hud/old/weaponhook.tga and /dev/null differ diff --git a/gfx/hud/old/weaponlaser.tga b/gfx/hud/old/weaponlaser.tga deleted file mode 100644 index b66500bbe..000000000 Binary files a/gfx/hud/old/weaponlaser.tga and /dev/null differ diff --git a/gfx/hud/old/weaponminstanex.tga b/gfx/hud/old/weaponminstanex.tga deleted file mode 100644 index ae1811344..000000000 Binary files a/gfx/hud/old/weaponminstanex.tga and /dev/null differ diff --git a/gfx/hud/old/weaponnex.tga b/gfx/hud/old/weaponnex.tga deleted file mode 100644 index 7523580fd..000000000 Binary files a/gfx/hud/old/weaponnex.tga and /dev/null differ diff --git a/gfx/hud/old/weaponporto.tga b/gfx/hud/old/weaponporto.tga deleted file mode 100644 index 444247ffd..000000000 Binary files a/gfx/hud/old/weaponporto.tga and /dev/null differ diff --git a/gfx/hud/old/weaponrocketlauncher.tga b/gfx/hud/old/weaponrocketlauncher.tga deleted file mode 100644 index bca989f5e..000000000 Binary files a/gfx/hud/old/weaponrocketlauncher.tga and /dev/null differ diff --git a/gfx/hud/old/weaponseeker.tga b/gfx/hud/old/weaponseeker.tga deleted file mode 100644 index 0a8cf7ed0..000000000 Binary files a/gfx/hud/old/weaponseeker.tga and /dev/null differ diff --git a/gfx/hud/old/weaponshotgun.tga b/gfx/hud/old/weaponshotgun.tga deleted file mode 100644 index 32f8e2047..000000000 Binary files a/gfx/hud/old/weaponshotgun.tga and /dev/null differ diff --git a/gfx/hud/old/weapontuba.tga b/gfx/hud/old/weapontuba.tga deleted file mode 100644 index ba59acaf1..000000000 Binary files a/gfx/hud/old/weapontuba.tga and /dev/null differ diff --git a/gfx/hud/old/weaponuzi.tga b/gfx/hud/old/weaponuzi.tga deleted file mode 100644 index 72ce48114..000000000 Binary files a/gfx/hud/old/weaponuzi.tga and /dev/null differ diff --git a/gfx/scoreboard/scoreboard_bg.tga b/gfx/scoreboard/scoreboard_bg.tga new file mode 100644 index 000000000..1d9ea76c4 Binary files /dev/null and b/gfx/scoreboard/scoreboard_bg.tga differ diff --git a/gfx/scoreboard/scoreboard_tableheader.tga b/gfx/scoreboard/scoreboard_tableheader.tga new file mode 100644 index 000000000..e43040f60 Binary files /dev/null and b/gfx/scoreboard/scoreboard_tableheader.tga differ diff --git a/gfx/weapons/weapon0.tga b/gfx/weapons/weapon0.tga new file mode 100644 index 000000000..b66500bbe Binary files /dev/null and b/gfx/weapons/weapon0.tga differ diff --git a/gfx/weapons/weapon1.tga b/gfx/weapons/weapon1.tga new file mode 100644 index 000000000..32f8e2047 Binary files /dev/null and b/gfx/weapons/weapon1.tga differ diff --git a/gfx/weapons/weapon10.tga b/gfx/weapons/weapon10.tga new file mode 100644 index 000000000..ae1811344 Binary files /dev/null and b/gfx/weapons/weapon10.tga differ diff --git a/gfx/weapons/weapon11.tga b/gfx/weapons/weapon11.tga new file mode 100644 index 000000000..a1f662e86 Binary files /dev/null and b/gfx/weapons/weapon11.tga differ diff --git a/gfx/weapons/weapon12.tga b/gfx/weapons/weapon12.tga new file mode 100644 index 000000000..b63c2d8f1 Binary files /dev/null and b/gfx/weapons/weapon12.tga differ diff --git a/gfx/weapons/weapon13.tga b/gfx/weapons/weapon13.tga new file mode 100644 index 000000000..0a8cf7ed0 Binary files /dev/null and b/gfx/weapons/weapon13.tga differ diff --git a/gfx/weapons/weapon14.tga b/gfx/weapons/weapon14.tga new file mode 100644 index 000000000..09da559dc Binary files /dev/null and b/gfx/weapons/weapon14.tga differ diff --git a/gfx/weapons/weapon15.tga b/gfx/weapons/weapon15.tga new file mode 100644 index 000000000..0a8cf7ed0 Binary files /dev/null and b/gfx/weapons/weapon15.tga differ diff --git a/gfx/weapons/weapon2.tga b/gfx/weapons/weapon2.tga new file mode 100644 index 000000000..72ce48114 Binary files /dev/null and b/gfx/weapons/weapon2.tga differ diff --git a/gfx/weapons/weapon3.tga b/gfx/weapons/weapon3.tga new file mode 100644 index 000000000..91a8ce451 Binary files /dev/null and b/gfx/weapons/weapon3.tga differ diff --git a/gfx/weapons/weapon4.tga b/gfx/weapons/weapon4.tga new file mode 100644 index 000000000..b800f0a6c Binary files /dev/null and b/gfx/weapons/weapon4.tga differ diff --git a/gfx/weapons/weapon5.tga b/gfx/weapons/weapon5.tga new file mode 100644 index 000000000..1a929671f Binary files /dev/null and b/gfx/weapons/weapon5.tga differ diff --git a/gfx/weapons/weapon6.tga b/gfx/weapons/weapon6.tga new file mode 100644 index 000000000..7523580fd Binary files /dev/null and b/gfx/weapons/weapon6.tga differ diff --git a/gfx/weapons/weapon7.tga b/gfx/weapons/weapon7.tga new file mode 100644 index 000000000..380315998 Binary files /dev/null and b/gfx/weapons/weapon7.tga differ diff --git a/gfx/weapons/weapon8.tga b/gfx/weapons/weapon8.tga new file mode 100644 index 000000000..bca989f5e Binary files /dev/null and b/gfx/weapons/weapon8.tga differ diff --git a/gfx/weapons/weapon9.tga b/gfx/weapons/weapon9.tga new file mode 100644 index 000000000..444247ffd Binary files /dev/null and b/gfx/weapons/weapon9.tga differ diff --git a/gfx/weapons/weapon_hlacmod_renameit.tga b/gfx/weapons/weapon_hlacmod_renameit.tga new file mode 100644 index 000000000..503dad91f Binary files /dev/null and b/gfx/weapons/weapon_hlacmod_renameit.tga differ diff --git a/gfx/weapons/weaponcampingrifle.tga b/gfx/weapons/weaponcampingrifle.tga new file mode 100644 index 000000000..09da559dc Binary files /dev/null and b/gfx/weapons/weaponcampingrifle.tga differ diff --git a/gfx/weapons/weaponcrylink.tga b/gfx/weapons/weaponcrylink.tga new file mode 100644 index 000000000..1a929671f Binary files /dev/null and b/gfx/weapons/weaponcrylink.tga differ diff --git a/gfx/weapons/weaponelectro.tga b/gfx/weapons/weaponelectro.tga new file mode 100644 index 000000000..b800f0a6c Binary files /dev/null and b/gfx/weapons/weaponelectro.tga differ diff --git a/gfx/weapons/weaponfireball.tga b/gfx/weapons/weaponfireball.tga new file mode 100644 index 000000000..b90d687b3 Binary files /dev/null and b/gfx/weapons/weaponfireball.tga differ diff --git a/gfx/weapons/weapongrenadelauncher.tga b/gfx/weapons/weapongrenadelauncher.tga new file mode 100644 index 000000000..91a8ce451 Binary files /dev/null and b/gfx/weapons/weapongrenadelauncher.tga differ diff --git a/gfx/weapons/weaponhagar.tga b/gfx/weapons/weaponhagar.tga new file mode 100644 index 000000000..380315998 Binary files /dev/null and b/gfx/weapons/weaponhagar.tga differ diff --git a/gfx/weapons/weaponhlac.tga b/gfx/weapons/weaponhlac.tga new file mode 100644 index 000000000..b63c2d8f1 Binary files /dev/null and b/gfx/weapons/weaponhlac.tga differ diff --git a/gfx/weapons/weaponhook.tga b/gfx/weapons/weaponhook.tga new file mode 100644 index 000000000..a1f662e86 Binary files /dev/null and b/gfx/weapons/weaponhook.tga differ diff --git a/gfx/weapons/weaponlaser.tga b/gfx/weapons/weaponlaser.tga new file mode 100644 index 000000000..b66500bbe Binary files /dev/null and b/gfx/weapons/weaponlaser.tga differ diff --git a/gfx/weapons/weaponminstanex.tga b/gfx/weapons/weaponminstanex.tga new file mode 100644 index 000000000..ae1811344 Binary files /dev/null and b/gfx/weapons/weaponminstanex.tga differ diff --git a/gfx/weapons/weaponnex.tga b/gfx/weapons/weaponnex.tga new file mode 100644 index 000000000..7523580fd Binary files /dev/null and b/gfx/weapons/weaponnex.tga differ diff --git a/gfx/weapons/weaponporto.tga b/gfx/weapons/weaponporto.tga new file mode 100644 index 000000000..444247ffd Binary files /dev/null and b/gfx/weapons/weaponporto.tga differ diff --git a/gfx/weapons/weaponrocketlauncher.tga b/gfx/weapons/weaponrocketlauncher.tga new file mode 100644 index 000000000..bca989f5e Binary files /dev/null and b/gfx/weapons/weaponrocketlauncher.tga differ diff --git a/gfx/weapons/weaponseeker.tga b/gfx/weapons/weaponseeker.tga new file mode 100644 index 000000000..0a8cf7ed0 Binary files /dev/null and b/gfx/weapons/weaponseeker.tga differ diff --git a/gfx/weapons/weaponshotgun.tga b/gfx/weapons/weaponshotgun.tga new file mode 100644 index 000000000..32f8e2047 Binary files /dev/null and b/gfx/weapons/weaponshotgun.tga differ diff --git a/gfx/weapons/weapontuba.tga b/gfx/weapons/weapontuba.tga new file mode 100644 index 000000000..ba59acaf1 Binary files /dev/null and b/gfx/weapons/weapontuba.tga differ diff --git a/gfx/weapons/weaponuzi.tga b/gfx/weapons/weaponuzi.tga new file mode 100644 index 000000000..72ce48114 Binary files /dev/null and b/gfx/weapons/weaponuzi.tga differ diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index f0a93b039..d71084937 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -1186,8 +1186,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), "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); + drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_current_bg", 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/weapons/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); @@ -1247,11 +1247,11 @@ string GetAmmoPicture(float i) { switch(i) { - case 0: return "shells"; - case 1: return "bullets"; - case 2: return "rocket"; - case 3: return "cells"; - case 4: return "fuel"; + case 0: return "ammo_shells"; + case 1: return "ammo_bullets"; + case 2: return "ammo_rocket"; + case 3: return "ammo_cells"; + case 4: return "ammo_fuel"; default: return ""; } } @@ -1277,7 +1277,7 @@ void HUD_Inventory() if(cvar("hud_inventory_onlycurrent")) { if (stat_items & GetAmmoItemCode(i)) { - drawpic_skin(pos, "ammobg", mySize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(pos, "ammo_current_bg", 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); @@ -1316,7 +1316,7 @@ void HUD_Inventory() } if (stat_items & GetAmmoItemCode(i)) - drawpic_skin(mypos, "ammobg", mysize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic_skin(mypos, "ammo_current_bg", 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)) diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc index 81d67b037..42dc620c0 100644 --- a/qcsrc/client/scoreboard.qc +++ b/qcsrc/client/scoreboard.qc @@ -759,7 +759,7 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz tmp_y = 1.25 * hud_fontsize_y; // rounded header - drawpic(pos, "gfx/hud/sb_scoreboard_tableheader", tmp, (rgb * hud_color_bg_team) + '0.5 0.5 0.5', sb_alpha_bg, DRAWFLAG_NORMAL); + drawpic(pos, "gfx/scoreboard/scoreboard_tableheader", tmp, (rgb * hud_color_bg_team) + '0.5 0.5 0.5', sb_alpha_bg, DRAWFLAG_NORMAL); // table border tmp_y += hud_border_thickness; @@ -775,7 +775,7 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz // table background tmp_y = body_table_height; - drawpic_tiled(pos, "gfx/hud/sb_scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, sb_alpha_bg, DRAWFLAG_NORMAL); + drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, sb_alpha_bg, DRAWFLAG_NORMAL); // anyway, apply some color //drawfill(pos, tmp + '2 0 0', rgb, 0.1, DRAWFLAG_NORMAL); @@ -909,7 +909,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) tmp_x = sbwidth; tmp_y = height * rows; - drawpic_tiled(pos, "gfx/hud/sb_scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, sb_alpha_bg, DRAWFLAG_NORMAL); + drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, sb_alpha_bg, DRAWFLAG_NORMAL); drawborderlines(hud_accuracy_border_thickness, pos, tmp, '0 0 0', sb_alpha_bg * 0.75, DRAWFLAG_NORMAL); // column highlighting @@ -954,7 +954,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) weapon_alpha = 0.2 * sb_alpha_fg; // weapon icon - drawpic(pos, strcat("gfx/hud/inv_weapon", self.netname), '1 0 0' * sbwidth * (1/weapon_cnt) + '0 1 0' * height * (2/3), '1 1 1', weapon_alpha, DRAWFLAG_NORMAL); + drawpic(pos, strcat("gfx/weapons/weapon", self.netname), '1 0 0' * sbwidth * (1/weapon_cnt) + '0 1 0' * height * (2/3), '1 1 1', weapon_alpha, DRAWFLAG_NORMAL); // the accuracy if(weapon_damage) { weapons_with_stats += 1; @@ -1012,7 +1012,7 @@ vector HUD_DrawScoreboardRankings(vector pos, entity pl, vector rgb, vector bg_ tmp_x = sbwidth; tmp_y = hud_fontsize_y * RANKINGS_RECEIVED_CNT; - drawpic_tiled(pos, "gfx/hud/sb_scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, sb_alpha_bg, DRAWFLAG_NORMAL); + drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, sb_alpha_bg, DRAWFLAG_NORMAL); drawborderlines(hud_border_thickness, pos, tmp, '0 0 0', sb_alpha_bg * 0.75, DRAWFLAG_NORMAL); // row highlighting @@ -1352,11 +1352,11 @@ void HUD_DrawAccuracyStats() pos_y = top_border_splash + row * (fill_size_y + row_margin); // background - drawpic(pos, "gfx/hud/sb_accuracy", fill_size , fill_colour, hud_alpha_bg, DRAWFLAG_NORMAL); + drawpic(pos, "gfx/scoreboard/accuracy_bg", fill_size , fill_colour, hud_alpha_bg, DRAWFLAG_NORMAL); drawborderlines(hud_border_thickness, pos, fill_size, border_colour, hud_alpha_bg, DRAWFLAG_NORMAL); // the weapon - drawpic(pos, strcat("gfx/hud/inv_weapon", self.netname), '1 0.5 0' * fill_size_x , '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic(pos, strcat("gfx/weapons/weapon", self.netname), '1 0.5 0' * fill_size_x , '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); // the amount of shots fired or max damage drawstringright(pos + '4.5 0 0' * hud_fontsize_x + '0 3 0' * hud_fontsize_y, ftos(weapon_damage), hud_fontsize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); @@ -1402,11 +1402,11 @@ void HUD_DrawAccuracyStats() pos_y = top_border_hitscan + row * (fill_size_y + row_margin); // background - drawpic(pos, "gfx/hud/sb_accuracy", fill_size , fill_colour, hud_alpha_bg, DRAWFLAG_NORMAL); + drawpic(pos, "gfx/scoreboard/accuracy_bg", fill_size , fill_colour, hud_alpha_bg, DRAWFLAG_NORMAL); drawborderlines(hud_border_thickness, pos, fill_size, border_colour, hud_alpha_bg, DRAWFLAG_NORMAL); // the weapon - drawpic(pos, strcat("gfx/hud/inv_weapon", self.netname), '1 0.5 0' * fill_size_x , '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic(pos, strcat("gfx/weapons/weapon", self.netname), '1 0.5 0' * fill_size_x , '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); // the amount of shots fired or max damage drawstringright(pos + '4.5 0 0' * hud_fontsize_x + '0 3 0' * hud_fontsize_y, ftos(weapon_damage), hud_fontsize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);