From: FruitieX Date: Wed, 19 May 2010 12:31:43 +0000 (+0300) Subject: move weapon icons back into the skin folders to make customization possible here... X-Git-Tag: xonotic-v0.1.0preview~541^2~135 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fbbc287da3b51cae888be2588ecbfa06067aafe5;p=xonotic%2Fxonotic-data.pk3dir.git move weapon icons back into the skin folders to make customization possible here, they're < 1MB uncompressed anyway --- diff --git a/gfx/hud/old/weapon_hlacmod_renameit.tga b/gfx/hud/old/weapon_hlacmod_renameit.tga new file mode 100644 index 0000000000..503dad91f6 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 0000000000..09da559dcf 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 0000000000..1a929671fe 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 0000000000..b800f0a6c8 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 0000000000..b90d687b32 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 0000000000..91a8ce451e 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 0000000000..380315998f 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 0000000000..b63c2d8f15 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 0000000000..a1f662e866 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 0000000000..b66500bbe2 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 0000000000..ae1811344e 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 0000000000..7523580fda 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 0000000000..444247ffd7 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 0000000000..bca989f5e9 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 0000000000..0a8cf7ed02 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 0000000000..32f8e20478 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 0000000000..ba59acaf14 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 0000000000..72ce48114e Binary files /dev/null and b/gfx/hud/old/weaponuzi.tga differ diff --git a/gfx/hud/wickedhud/weapon_hlacmod_renameit.tga b/gfx/hud/wickedhud/weapon_hlacmod_renameit.tga new file mode 100644 index 0000000000..503dad91f6 Binary files /dev/null and b/gfx/hud/wickedhud/weapon_hlacmod_renameit.tga differ diff --git a/gfx/hud/wickedhud/weaponcampingrifle.tga b/gfx/hud/wickedhud/weaponcampingrifle.tga new file mode 100644 index 0000000000..09da559dcf Binary files /dev/null and b/gfx/hud/wickedhud/weaponcampingrifle.tga differ diff --git a/gfx/hud/wickedhud/weaponcrylink.tga b/gfx/hud/wickedhud/weaponcrylink.tga new file mode 100644 index 0000000000..1a929671fe Binary files /dev/null and b/gfx/hud/wickedhud/weaponcrylink.tga differ diff --git a/gfx/hud/wickedhud/weaponelectro.tga b/gfx/hud/wickedhud/weaponelectro.tga new file mode 100644 index 0000000000..b800f0a6c8 Binary files /dev/null and b/gfx/hud/wickedhud/weaponelectro.tga differ diff --git a/gfx/hud/wickedhud/weaponfireball.tga b/gfx/hud/wickedhud/weaponfireball.tga new file mode 100644 index 0000000000..b90d687b32 Binary files /dev/null and b/gfx/hud/wickedhud/weaponfireball.tga differ diff --git a/gfx/hud/wickedhud/weapongrenadelauncher.tga b/gfx/hud/wickedhud/weapongrenadelauncher.tga new file mode 100644 index 0000000000..91a8ce451e Binary files /dev/null and b/gfx/hud/wickedhud/weapongrenadelauncher.tga differ diff --git a/gfx/hud/wickedhud/weaponhagar.tga b/gfx/hud/wickedhud/weaponhagar.tga new file mode 100644 index 0000000000..380315998f Binary files /dev/null and b/gfx/hud/wickedhud/weaponhagar.tga differ diff --git a/gfx/hud/wickedhud/weaponhlac.tga b/gfx/hud/wickedhud/weaponhlac.tga new file mode 100644 index 0000000000..b63c2d8f15 Binary files /dev/null and b/gfx/hud/wickedhud/weaponhlac.tga differ diff --git a/gfx/hud/wickedhud/weaponhook.tga b/gfx/hud/wickedhud/weaponhook.tga new file mode 100644 index 0000000000..a1f662e866 Binary files /dev/null and b/gfx/hud/wickedhud/weaponhook.tga differ diff --git a/gfx/hud/wickedhud/weaponlaser.tga b/gfx/hud/wickedhud/weaponlaser.tga new file mode 100644 index 0000000000..b66500bbe2 Binary files /dev/null and b/gfx/hud/wickedhud/weaponlaser.tga differ diff --git a/gfx/hud/wickedhud/weaponminstanex.tga b/gfx/hud/wickedhud/weaponminstanex.tga new file mode 100644 index 0000000000..ae1811344e Binary files /dev/null and b/gfx/hud/wickedhud/weaponminstanex.tga differ diff --git a/gfx/hud/wickedhud/weaponnex.tga b/gfx/hud/wickedhud/weaponnex.tga new file mode 100644 index 0000000000..7523580fda Binary files /dev/null and b/gfx/hud/wickedhud/weaponnex.tga differ diff --git a/gfx/hud/wickedhud/weaponporto.tga b/gfx/hud/wickedhud/weaponporto.tga new file mode 100644 index 0000000000..444247ffd7 Binary files /dev/null and b/gfx/hud/wickedhud/weaponporto.tga differ diff --git a/gfx/hud/wickedhud/weaponrocketlauncher.tga b/gfx/hud/wickedhud/weaponrocketlauncher.tga new file mode 100644 index 0000000000..bca989f5e9 Binary files /dev/null and b/gfx/hud/wickedhud/weaponrocketlauncher.tga differ diff --git a/gfx/hud/wickedhud/weaponseeker.tga b/gfx/hud/wickedhud/weaponseeker.tga new file mode 100644 index 0000000000..0a8cf7ed02 Binary files /dev/null and b/gfx/hud/wickedhud/weaponseeker.tga differ diff --git a/gfx/hud/wickedhud/weaponshotgun.tga b/gfx/hud/wickedhud/weaponshotgun.tga new file mode 100644 index 0000000000..32f8e20478 Binary files /dev/null and b/gfx/hud/wickedhud/weaponshotgun.tga differ diff --git a/gfx/hud/wickedhud/weapontuba.tga b/gfx/hud/wickedhud/weapontuba.tga new file mode 100644 index 0000000000..ba59acaf14 Binary files /dev/null and b/gfx/hud/wickedhud/weapontuba.tga differ diff --git a/gfx/hud/wickedhud/weaponuzi.tga b/gfx/hud/wickedhud/weaponuzi.tga new file mode 100644 index 0000000000..72ce48114e Binary files /dev/null and b/gfx/hud/wickedhud/weaponuzi.tga differ diff --git a/gfx/weapons/weapon_hlacmod_renameit.tga b/gfx/weapons/weapon_hlacmod_renameit.tga deleted file mode 100644 index 503dad91f6..0000000000 Binary files a/gfx/weapons/weapon_hlacmod_renameit.tga and /dev/null differ diff --git a/gfx/weapons/weaponcampingrifle.tga b/gfx/weapons/weaponcampingrifle.tga deleted file mode 100644 index 09da559dcf..0000000000 Binary files a/gfx/weapons/weaponcampingrifle.tga and /dev/null differ diff --git a/gfx/weapons/weaponcrylink.tga b/gfx/weapons/weaponcrylink.tga deleted file mode 100644 index 1a929671fe..0000000000 Binary files a/gfx/weapons/weaponcrylink.tga and /dev/null differ diff --git a/gfx/weapons/weaponelectro.tga b/gfx/weapons/weaponelectro.tga deleted file mode 100644 index b800f0a6c8..0000000000 Binary files a/gfx/weapons/weaponelectro.tga and /dev/null differ diff --git a/gfx/weapons/weaponfireball.tga b/gfx/weapons/weaponfireball.tga deleted file mode 100644 index b90d687b32..0000000000 Binary files a/gfx/weapons/weaponfireball.tga and /dev/null differ diff --git a/gfx/weapons/weapongrenadelauncher.tga b/gfx/weapons/weapongrenadelauncher.tga deleted file mode 100644 index 91a8ce451e..0000000000 Binary files a/gfx/weapons/weapongrenadelauncher.tga and /dev/null differ diff --git a/gfx/weapons/weaponhagar.tga b/gfx/weapons/weaponhagar.tga deleted file mode 100644 index 380315998f..0000000000 Binary files a/gfx/weapons/weaponhagar.tga and /dev/null differ diff --git a/gfx/weapons/weaponhlac.tga b/gfx/weapons/weaponhlac.tga deleted file mode 100644 index b63c2d8f15..0000000000 Binary files a/gfx/weapons/weaponhlac.tga and /dev/null differ diff --git a/gfx/weapons/weaponhook.tga b/gfx/weapons/weaponhook.tga deleted file mode 100644 index a1f662e866..0000000000 Binary files a/gfx/weapons/weaponhook.tga and /dev/null differ diff --git a/gfx/weapons/weaponlaser.tga b/gfx/weapons/weaponlaser.tga deleted file mode 100644 index b66500bbe2..0000000000 Binary files a/gfx/weapons/weaponlaser.tga and /dev/null differ diff --git a/gfx/weapons/weaponminstanex.tga b/gfx/weapons/weaponminstanex.tga deleted file mode 100644 index ae1811344e..0000000000 Binary files a/gfx/weapons/weaponminstanex.tga and /dev/null differ diff --git a/gfx/weapons/weaponnex.tga b/gfx/weapons/weaponnex.tga deleted file mode 100644 index 7523580fda..0000000000 Binary files a/gfx/weapons/weaponnex.tga and /dev/null differ diff --git a/gfx/weapons/weaponporto.tga b/gfx/weapons/weaponporto.tga deleted file mode 100644 index 444247ffd7..0000000000 Binary files a/gfx/weapons/weaponporto.tga and /dev/null differ diff --git a/gfx/weapons/weaponrocketlauncher.tga b/gfx/weapons/weaponrocketlauncher.tga deleted file mode 100644 index bca989f5e9..0000000000 Binary files a/gfx/weapons/weaponrocketlauncher.tga and /dev/null differ diff --git a/gfx/weapons/weaponseeker.tga b/gfx/weapons/weaponseeker.tga deleted file mode 100644 index 0a8cf7ed02..0000000000 Binary files a/gfx/weapons/weaponseeker.tga and /dev/null differ diff --git a/gfx/weapons/weaponshotgun.tga b/gfx/weapons/weaponshotgun.tga deleted file mode 100644 index 32f8e20478..0000000000 Binary files a/gfx/weapons/weaponshotgun.tga and /dev/null differ diff --git a/gfx/weapons/weapontuba.tga b/gfx/weapons/weapontuba.tga deleted file mode 100644 index ba59acaf14..0000000000 Binary files a/gfx/weapons/weapontuba.tga and /dev/null differ diff --git a/gfx/weapons/weaponuzi.tga b/gfx/weapons/weaponuzi.tga deleted file mode 100644 index 72ce48114e..0000000000 Binary files a/gfx/weapons/weaponuzi.tga and /dev/null differ diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index c04960cd31..568fa894e5 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -1261,7 +1261,7 @@ void HUD_WeaponIcons() } // draw the weapon icon - 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); + 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(weapid), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);