From: Severin Meyer Date: Sat, 25 Jul 2015 16:52:18 +0000 (+0200) Subject: Integrate the vehicle HUD images into the existing HUD themes. X-Git-Tag: xonotic-v0.8.1~31^2~6 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1fc8d2248e9e9f2883ea2e51375787d5336fa4ce;p=xonotic%2Fxonotic-data.pk3dir.git Integrate the vehicle HUD images into the existing HUD themes. --- diff --git a/gfx/hud/default/null.tga b/gfx/hud/default/null.tga new file mode 100644 index 000000000..0aa070014 Binary files /dev/null and b/gfx/hud/default/null.tga differ diff --git a/gfx/hud/default/vehicle_bar_northeast.tga b/gfx/hud/default/vehicle_bar_northeast.tga new file mode 100644 index 000000000..b01df47ee Binary files /dev/null and b/gfx/hud/default/vehicle_bar_northeast.tga differ diff --git a/gfx/hud/default/vehicle_bar_northwest.tga b/gfx/hud/default/vehicle_bar_northwest.tga new file mode 100644 index 000000000..de06fc103 Binary files /dev/null and b/gfx/hud/default/vehicle_bar_northwest.tga differ diff --git a/gfx/hud/default/vehicle_bar_southeast.tga b/gfx/hud/default/vehicle_bar_southeast.tga new file mode 100644 index 000000000..cd3919653 Binary files /dev/null and b/gfx/hud/default/vehicle_bar_southeast.tga differ diff --git a/gfx/hud/default/vehicle_bar_southwest.tga b/gfx/hud/default/vehicle_bar_southwest.tga new file mode 100644 index 000000000..9c0dbb910 Binary files /dev/null and b/gfx/hud/default/vehicle_bar_southwest.tga differ diff --git a/gfx/hud/default/vehicle_bumble.tga b/gfx/hud/default/vehicle_bumble.tga new file mode 100644 index 000000000..bcf849eb1 Binary files /dev/null and b/gfx/hud/default/vehicle_bumble.tga differ diff --git a/gfx/hud/default/vehicle_bumble_weapon1.tga b/gfx/hud/default/vehicle_bumble_weapon1.tga new file mode 100644 index 000000000..d6e5e905c Binary files /dev/null and b/gfx/hud/default/vehicle_bumble_weapon1.tga differ diff --git a/gfx/hud/default/vehicle_bumble_weapon2.tga b/gfx/hud/default/vehicle_bumble_weapon2.tga new file mode 100644 index 000000000..02c1a7476 Binary files /dev/null and b/gfx/hud/default/vehicle_bumble_weapon2.tga differ diff --git a/gfx/hud/default/vehicle_frame.tga b/gfx/hud/default/vehicle_frame.tga new file mode 100644 index 000000000..9a687b920 Binary files /dev/null and b/gfx/hud/default/vehicle_frame.tga differ diff --git a/gfx/hud/default/vehicle_gunner.tga b/gfx/hud/default/vehicle_gunner.tga new file mode 100644 index 000000000..d5c5280db Binary files /dev/null and b/gfx/hud/default/vehicle_gunner.tga differ diff --git a/gfx/hud/default/vehicle_gunner_weapon1.tga b/gfx/hud/default/vehicle_gunner_weapon1.tga new file mode 100644 index 000000000..848c4631a Binary files /dev/null and b/gfx/hud/default/vehicle_gunner_weapon1.tga differ diff --git a/gfx/hud/default/vehicle_icon_ammo1.tga b/gfx/hud/default/vehicle_icon_ammo1.tga new file mode 100644 index 000000000..b65db01f3 Binary files /dev/null and b/gfx/hud/default/vehicle_icon_ammo1.tga differ diff --git a/gfx/hud/default/vehicle_icon_ammo2.tga b/gfx/hud/default/vehicle_icon_ammo2.tga new file mode 100644 index 000000000..56c5b255a Binary files /dev/null and b/gfx/hud/default/vehicle_icon_ammo2.tga differ diff --git a/gfx/hud/default/vehicle_icon_health.tga b/gfx/hud/default/vehicle_icon_health.tga new file mode 100644 index 000000000..59bb1b964 Binary files /dev/null and b/gfx/hud/default/vehicle_icon_health.tga differ diff --git a/gfx/hud/default/vehicle_icon_shield.tga b/gfx/hud/default/vehicle_icon_shield.tga new file mode 100644 index 000000000..edb9c9e9f Binary files /dev/null and b/gfx/hud/default/vehicle_icon_shield.tga differ diff --git a/gfx/hud/default/vehicle_racer.tga b/gfx/hud/default/vehicle_racer.tga new file mode 100644 index 000000000..d8cadd351 Binary files /dev/null and b/gfx/hud/default/vehicle_racer.tga differ diff --git a/gfx/hud/default/vehicle_racer_weapon1.tga b/gfx/hud/default/vehicle_racer_weapon1.tga new file mode 100644 index 000000000..d9e09ded1 Binary files /dev/null and b/gfx/hud/default/vehicle_racer_weapon1.tga differ diff --git a/gfx/hud/default/vehicle_racer_weapon2.tga b/gfx/hud/default/vehicle_racer_weapon2.tga new file mode 100644 index 000000000..f0c71c6c6 Binary files /dev/null and b/gfx/hud/default/vehicle_racer_weapon2.tga differ diff --git a/gfx/hud/default/vehicle_raptor.tga b/gfx/hud/default/vehicle_raptor.tga new file mode 100644 index 000000000..67f188962 Binary files /dev/null and b/gfx/hud/default/vehicle_raptor.tga differ diff --git a/gfx/hud/default/vehicle_raptor_weapon1.tga b/gfx/hud/default/vehicle_raptor_weapon1.tga new file mode 100644 index 000000000..1b4b6fb53 Binary files /dev/null and b/gfx/hud/default/vehicle_raptor_weapon1.tga differ diff --git a/gfx/hud/default/vehicle_raptor_weapon2.tga b/gfx/hud/default/vehicle_raptor_weapon2.tga new file mode 100644 index 000000000..039adc8a2 Binary files /dev/null and b/gfx/hud/default/vehicle_raptor_weapon2.tga differ diff --git a/gfx/hud/default/vehicle_shield.tga b/gfx/hud/default/vehicle_shield.tga new file mode 100644 index 000000000..2413062ff Binary files /dev/null and b/gfx/hud/default/vehicle_shield.tga differ diff --git a/gfx/hud/default/vehicle_spider.tga b/gfx/hud/default/vehicle_spider.tga new file mode 100644 index 000000000..87ef9d483 Binary files /dev/null and b/gfx/hud/default/vehicle_spider.tga differ diff --git a/gfx/hud/default/vehicle_spider_weapon1.tga b/gfx/hud/default/vehicle_spider_weapon1.tga new file mode 100644 index 000000000..40c3644fe Binary files /dev/null and b/gfx/hud/default/vehicle_spider_weapon1.tga differ diff --git a/gfx/hud/default/vehicle_spider_weapon2.tga b/gfx/hud/default/vehicle_spider_weapon2.tga new file mode 100644 index 000000000..20987dd54 Binary files /dev/null and b/gfx/hud/default/vehicle_spider_weapon2.tga differ diff --git a/gfx/hud/luma/null.tga b/gfx/hud/luma/null.tga new file mode 100644 index 000000000..0aa070014 Binary files /dev/null and b/gfx/hud/luma/null.tga differ diff --git a/gfx/hud/luma/vehicle_bar_northeast.tga b/gfx/hud/luma/vehicle_bar_northeast.tga new file mode 100644 index 000000000..de9fea79b Binary files /dev/null and b/gfx/hud/luma/vehicle_bar_northeast.tga differ diff --git a/gfx/hud/luma/vehicle_bar_northwest.tga b/gfx/hud/luma/vehicle_bar_northwest.tga new file mode 100644 index 000000000..4c8146163 Binary files /dev/null and b/gfx/hud/luma/vehicle_bar_northwest.tga differ diff --git a/gfx/hud/luma/vehicle_bar_southeast.tga b/gfx/hud/luma/vehicle_bar_southeast.tga new file mode 100644 index 000000000..82fb43f89 Binary files /dev/null and b/gfx/hud/luma/vehicle_bar_southeast.tga differ diff --git a/gfx/hud/luma/vehicle_bar_southwest.tga b/gfx/hud/luma/vehicle_bar_southwest.tga new file mode 100644 index 000000000..2b65269c3 Binary files /dev/null and b/gfx/hud/luma/vehicle_bar_southwest.tga differ diff --git a/gfx/hud/luma/vehicle_bumble.tga b/gfx/hud/luma/vehicle_bumble.tga new file mode 100644 index 000000000..a9fc38a7c Binary files /dev/null and b/gfx/hud/luma/vehicle_bumble.tga differ diff --git a/gfx/hud/luma/vehicle_bumble_weapon1.tga b/gfx/hud/luma/vehicle_bumble_weapon1.tga new file mode 100644 index 000000000..546306520 Binary files /dev/null and b/gfx/hud/luma/vehicle_bumble_weapon1.tga differ diff --git a/gfx/hud/luma/vehicle_bumble_weapon2.tga b/gfx/hud/luma/vehicle_bumble_weapon2.tga new file mode 100644 index 000000000..628c44af5 Binary files /dev/null and b/gfx/hud/luma/vehicle_bumble_weapon2.tga differ diff --git a/gfx/hud/luma/vehicle_frame.tga b/gfx/hud/luma/vehicle_frame.tga new file mode 100644 index 000000000..41e20ef0f Binary files /dev/null and b/gfx/hud/luma/vehicle_frame.tga differ diff --git a/gfx/hud/luma/vehicle_gunner.tga b/gfx/hud/luma/vehicle_gunner.tga new file mode 100644 index 000000000..7068ffe6b Binary files /dev/null and b/gfx/hud/luma/vehicle_gunner.tga differ diff --git a/gfx/hud/luma/vehicle_gunner_weapon1.tga b/gfx/hud/luma/vehicle_gunner_weapon1.tga new file mode 100644 index 000000000..31e5457df Binary files /dev/null and b/gfx/hud/luma/vehicle_gunner_weapon1.tga differ diff --git a/gfx/hud/luma/vehicle_icon_ammo1.tga b/gfx/hud/luma/vehicle_icon_ammo1.tga new file mode 100644 index 000000000..ae90b9efa Binary files /dev/null and b/gfx/hud/luma/vehicle_icon_ammo1.tga differ diff --git a/gfx/hud/luma/vehicle_icon_ammo2.tga b/gfx/hud/luma/vehicle_icon_ammo2.tga new file mode 100644 index 000000000..14a64b7e1 Binary files /dev/null and b/gfx/hud/luma/vehicle_icon_ammo2.tga differ diff --git a/gfx/hud/luma/vehicle_icon_health.tga b/gfx/hud/luma/vehicle_icon_health.tga new file mode 100644 index 000000000..56ba0f1c9 Binary files /dev/null and b/gfx/hud/luma/vehicle_icon_health.tga differ diff --git a/gfx/hud/luma/vehicle_icon_shield.tga b/gfx/hud/luma/vehicle_icon_shield.tga new file mode 100644 index 000000000..82c8369b2 Binary files /dev/null and b/gfx/hud/luma/vehicle_icon_shield.tga differ diff --git a/gfx/hud/luma/vehicle_racer.tga b/gfx/hud/luma/vehicle_racer.tga new file mode 100644 index 000000000..2d6e0ff90 Binary files /dev/null and b/gfx/hud/luma/vehicle_racer.tga differ diff --git a/gfx/hud/luma/vehicle_racer_weapon1.tga b/gfx/hud/luma/vehicle_racer_weapon1.tga new file mode 100644 index 000000000..3d0c56e2f Binary files /dev/null and b/gfx/hud/luma/vehicle_racer_weapon1.tga differ diff --git a/gfx/hud/luma/vehicle_racer_weapon2.tga b/gfx/hud/luma/vehicle_racer_weapon2.tga new file mode 100644 index 000000000..d79175ae2 Binary files /dev/null and b/gfx/hud/luma/vehicle_racer_weapon2.tga differ diff --git a/gfx/hud/luma/vehicle_raptor.tga b/gfx/hud/luma/vehicle_raptor.tga new file mode 100644 index 000000000..78b9f7d31 Binary files /dev/null and b/gfx/hud/luma/vehicle_raptor.tga differ diff --git a/gfx/hud/luma/vehicle_raptor_weapon1.tga b/gfx/hud/luma/vehicle_raptor_weapon1.tga new file mode 100644 index 000000000..68491d1fe Binary files /dev/null and b/gfx/hud/luma/vehicle_raptor_weapon1.tga differ diff --git a/gfx/hud/luma/vehicle_raptor_weapon2.tga b/gfx/hud/luma/vehicle_raptor_weapon2.tga new file mode 100644 index 000000000..1aff0d4f2 Binary files /dev/null and b/gfx/hud/luma/vehicle_raptor_weapon2.tga differ diff --git a/gfx/hud/luma/vehicle_shield.tga b/gfx/hud/luma/vehicle_shield.tga new file mode 100644 index 000000000..5b7570a55 Binary files /dev/null and b/gfx/hud/luma/vehicle_shield.tga differ diff --git a/gfx/hud/luma/vehicle_spider.tga b/gfx/hud/luma/vehicle_spider.tga new file mode 100644 index 000000000..f49d32ba8 Binary files /dev/null and b/gfx/hud/luma/vehicle_spider.tga differ diff --git a/gfx/hud/luma/vehicle_spider_weapon1.tga b/gfx/hud/luma/vehicle_spider_weapon1.tga new file mode 100644 index 000000000..660b5b3c4 Binary files /dev/null and b/gfx/hud/luma/vehicle_spider_weapon1.tga differ diff --git a/gfx/hud/luma/vehicle_spider_weapon2.tga b/gfx/hud/luma/vehicle_spider_weapon2.tga new file mode 100644 index 000000000..0382a3db0 Binary files /dev/null and b/gfx/hud/luma/vehicle_spider_weapon2.tga differ diff --git a/gfx/vehicles/bar_dwn_left.tga b/gfx/vehicles/bar_dwn_left.tga deleted file mode 100644 index 2b65269c3..000000000 Binary files a/gfx/vehicles/bar_dwn_left.tga and /dev/null differ diff --git a/gfx/vehicles/bar_dwn_right.tga b/gfx/vehicles/bar_dwn_right.tga deleted file mode 100644 index 82fb43f89..000000000 Binary files a/gfx/vehicles/bar_dwn_right.tga and /dev/null differ diff --git a/gfx/vehicles/bar_up_left.tga b/gfx/vehicles/bar_up_left.tga deleted file mode 100644 index 4c8146163..000000000 Binary files a/gfx/vehicles/bar_up_left.tga and /dev/null differ diff --git a/gfx/vehicles/bar_up_right.tga b/gfx/vehicles/bar_up_right.tga deleted file mode 100644 index de9fea79b..000000000 Binary files a/gfx/vehicles/bar_up_right.tga and /dev/null differ diff --git a/gfx/vehicles/bullets.tga b/gfx/vehicles/bullets.tga deleted file mode 100644 index ae90b9efa..000000000 Binary files a/gfx/vehicles/bullets.tga and /dev/null differ diff --git a/gfx/vehicles/bumb.tga b/gfx/vehicles/bumb.tga deleted file mode 100644 index a9fc38a7c..000000000 Binary files a/gfx/vehicles/bumb.tga and /dev/null differ diff --git a/gfx/vehicles/bumb_lgun.tga b/gfx/vehicles/bumb_lgun.tga deleted file mode 100644 index 546306520..000000000 Binary files a/gfx/vehicles/bumb_lgun.tga and /dev/null differ diff --git a/gfx/vehicles/bumb_rgun.tga b/gfx/vehicles/bumb_rgun.tga deleted file mode 100644 index 628c44af5..000000000 Binary files a/gfx/vehicles/bumb_rgun.tga and /dev/null differ diff --git a/gfx/vehicles/bumb_side.tga b/gfx/vehicles/bumb_side.tga deleted file mode 100644 index 7068ffe6b..000000000 Binary files a/gfx/vehicles/bumb_side.tga and /dev/null differ diff --git a/gfx/vehicles/bumb_side_gun.tga b/gfx/vehicles/bumb_side_gun.tga deleted file mode 100644 index 31e5457df..000000000 Binary files a/gfx/vehicles/bumb_side_gun.tga and /dev/null differ diff --git a/gfx/vehicles/frame.tga b/gfx/vehicles/frame.tga deleted file mode 100644 index 769c061ae..000000000 Binary files a/gfx/vehicles/frame.tga and /dev/null differ diff --git a/gfx/vehicles/health.tga b/gfx/vehicles/health.tga deleted file mode 100644 index 56ba0f1c9..000000000 Binary files a/gfx/vehicles/health.tga and /dev/null differ diff --git a/gfx/vehicles/null.tga b/gfx/vehicles/null.tga deleted file mode 100644 index 0aa070014..000000000 Binary files a/gfx/vehicles/null.tga and /dev/null differ diff --git a/gfx/vehicles/raptor.tga b/gfx/vehicles/raptor.tga deleted file mode 100644 index 78b9f7d31..000000000 Binary files a/gfx/vehicles/raptor.tga and /dev/null differ diff --git a/gfx/vehicles/raptor_bombs.tga b/gfx/vehicles/raptor_bombs.tga deleted file mode 100644 index 1aff0d4f2..000000000 Binary files a/gfx/vehicles/raptor_bombs.tga and /dev/null differ diff --git a/gfx/vehicles/raptor_guns.tga b/gfx/vehicles/raptor_guns.tga deleted file mode 100644 index 68491d1fe..000000000 Binary files a/gfx/vehicles/raptor_guns.tga and /dev/null differ diff --git a/gfx/vehicles/rocket.tga b/gfx/vehicles/rocket.tga deleted file mode 100644 index 14a64b7e1..000000000 Binary files a/gfx/vehicles/rocket.tga and /dev/null differ diff --git a/gfx/vehicles/sbot.tga b/gfx/vehicles/sbot.tga deleted file mode 100644 index f49d32ba8..000000000 Binary files a/gfx/vehicles/sbot.tga and /dev/null differ diff --git a/gfx/vehicles/sbot_mguns.tga b/gfx/vehicles/sbot_mguns.tga deleted file mode 100644 index 660b5b3c4..000000000 Binary files a/gfx/vehicles/sbot_mguns.tga and /dev/null differ diff --git a/gfx/vehicles/sbot_rpods.tga b/gfx/vehicles/sbot_rpods.tga deleted file mode 100644 index 0382a3db0..000000000 Binary files a/gfx/vehicles/sbot_rpods.tga and /dev/null differ diff --git a/gfx/vehicles/shield.tga b/gfx/vehicles/shield.tga deleted file mode 100644 index 82c8369b2..000000000 Binary files a/gfx/vehicles/shield.tga and /dev/null differ diff --git a/gfx/vehicles/template.png b/gfx/vehicles/template.png deleted file mode 100644 index 227200f99..000000000 Binary files a/gfx/vehicles/template.png and /dev/null differ diff --git a/gfx/vehicles/vh-shield.tga b/gfx/vehicles/vh-shield.tga deleted file mode 100644 index 5b7570a55..000000000 Binary files a/gfx/vehicles/vh-shield.tga and /dev/null differ diff --git a/gfx/vehicles/waki.tga b/gfx/vehicles/waki.tga deleted file mode 100644 index 2d6e0ff90..000000000 Binary files a/gfx/vehicles/waki.tga and /dev/null differ diff --git a/gfx/vehicles/waki_guns.tga b/gfx/vehicles/waki_guns.tga deleted file mode 100644 index 3d0c56e2f..000000000 Binary files a/gfx/vehicles/waki_guns.tga and /dev/null differ diff --git a/gfx/vehicles/waki_rockets.tga b/gfx/vehicles/waki_rockets.tga deleted file mode 100644 index d79175ae2..000000000 Binary files a/gfx/vehicles/waki_rockets.tga and /dev/null differ diff --git a/qcsrc/client/vehicles/all.qc b/qcsrc/client/vehicles/all.qc index 0b6de3e8e..09a3d8337 100644 --- a/qcsrc/client/vehicles/all.qc +++ b/qcsrc/client/vehicles/all.qc @@ -16,41 +16,12 @@ .float cnt; -const string vNULL = "gfx/vehicles/null.tga"; -const string vFRAME = "gfx/vehicles/frame.tga"; - -const string vMODEL_SHIELD = "gfx/vehicles/vh-shield.tga"; -const string vMODEL_BUMBLE = "gfx/vehicles/bumb.tga"; -const string vMODEL_BUMBLE_WEAPON1 = "gfx/vehicles/bumb_lgun.tga"; -const string vMODEL_BUMBLE_WEAPON2 = "gfx/vehicles/bumb_rgun.tga"; -const string vMODEL_GUNNER = "gfx/vehicles/bumb_side.tga"; -const string vMODEL_GUNNER_WEAPON1 = "gfx/vehicles/bumb_side_gun.tga"; -const string vMODEL_RAPTOR = "gfx/vehicles/raptor.tga"; -const string vMODEL_RAPTOR_WEAPON1 = "gfx/vehicles/raptor_guns.tga"; -const string vMODEL_RAPTOR_WEAPON2 = "gfx/vehicles/raptor_bombs.tga"; -const string vMODEL_SPIDER = "gfx/vehicles/sbot.tga"; -const string vMODEL_SPIDER_WEAPON1 = "gfx/vehicles/sbot_mguns.tga"; -const string vMODEL_SPIDER_WEAPON2 = "gfx/vehicles/sbot_rpods.tga"; -const string vMODEL_RACER = "gfx/vehicles/waki.tga"; -const string vMODEL_RACER_WEAPON1 = "gfx/vehicles/waki_guns.tga"; -const string vMODEL_RACER_WEAPON2 = "gfx/vehicles/waki_rockets.tga"; - -const string vBAR_HEALTH = "gfx/vehicles/bar_up_left.tga"; -const string vBAR_SHIELD = "gfx/vehicles/bar_dwn_left.tga"; -const string vBAR_AMMO1 = "gfx/vehicles/bar_up_right.tga"; -const string vBAR_AMMO2 = "gfx/vehicles/bar_dwn_right.tga"; - -const string vICON_HEALTH = "gfx/vehicles/health.tga"; -const string vICON_SHIELD = "gfx/vehicles/shield.tga"; -const string vICON_AMMO1 = "gfx/vehicles/bullets.tga"; -const string vICON_AMMO2 = "gfx/vehicles/rocket.tga"; - const string vCROSS_AIM = "gfx/vehicles/crosshair_aim.tga"; const string vCROSS_DROP = "gfx/vehicles/crosshair_drop.tga"; const string vCROSS_HEAL = "gfx/vehicles/crosshair_heal.tga"; const string vCROSS_HINT = "gfx/vehicles/crosshair_hint.tga"; const string vCROSS_LOCK = "gfx/vehicles/crosshair_lock.tga"; -const string vCROSS_TAG = "gfx/vehicles/crosshair_tag.tga.tga"; +const string vCROSS_TAG = "gfx/vehicles/crosshair_tag.tga"; const int SBRM_FIRST = 1; const int SBRM_VOLLY = 1; @@ -193,9 +164,9 @@ void Net_VehicleSetup() } void Vehicles_drawHUD( - string modelBase, - string modelWeapon1, - string modelWeapon2, + string vehicle, + string vehicleWeapon1, + string vehicleWeapon2, string iconAmmo1, vector colorAmmo1, string iconAmmo2, @@ -230,14 +201,18 @@ void Vehicles_drawHUD( ammo1 = (ammo1) ? ammo1 : energy; // Frame - hudSize = draw_getimagesize(vFRAME) * autocvar_cl_vehicles_hudscale; + string frame = strcat(hud_skin_path, "/vehicle_frame"); + if (precache_pic(frame) == "") + frame = "gfx/hud/default/vehicle_frame"; + + hudSize = draw_getimagesize(frame) * autocvar_cl_vehicles_hudscale; hudPos.x = (vid_conwidth - hudSize.x) / 2; hudPos.y = vid_conheight - hudSize.y; if(teamplay && autocvar_hud_panel_bg_color_team) - drawpic(hudPos, vFRAME, hudSize, myteamcolors * autocvar_hud_panel_bg_color_team, autocvar_hud_panel_bg_alpha, DRAWFLAG_NORMAL); + drawpic(hudPos, frame, hudSize, myteamcolors * autocvar_hud_panel_bg_color_team, autocvar_hud_panel_bg_alpha, DRAWFLAG_NORMAL); else - drawpic(hudPos, vFRAME, hudSize, autocvar_hud_panel_bg_color, autocvar_hud_panel_bg_alpha, DRAWFLAG_NORMAL); + drawpic(hudPos, frame, hudSize, autocvar_hud_panel_bg_color, autocvar_hud_panel_bg_alpha, DRAWFLAG_NORMAL); // Model tmpSize.x = hudSize.x / 3; @@ -246,13 +221,13 @@ void Vehicles_drawHUD( tmpPos.y = hudPos.y; if(health < 0.25) - drawpic(tmpPos, modelBase, tmpSize, '1 0 0' + '0 1 1' * blinkValue, hudAlpha, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, vehicle, tmpSize, '1 0 0' + '0 1 1' * blinkValue, hudAlpha, DRAWFLAG_NORMAL); else - drawpic(tmpPos, modelBase, tmpSize, '1 1 1' * health + '1 0 0' * (1 - health), hudAlpha, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, vehicle, tmpSize, '1 1 1' * health + '1 0 0' * (1 - health), hudAlpha, DRAWFLAG_NORMAL); - drawpic(tmpPos, modelWeapon1, tmpSize, '1 1 1' * ammo1 + '1 0 0' * (1 - ammo1), hudAlpha, DRAWFLAG_NORMAL); - drawpic(tmpPos, modelWeapon2, tmpSize, '1 1 1' * ammo2 + '1 0 0' * (1 - ammo2), hudAlpha, DRAWFLAG_NORMAL); - drawpic(tmpPos, vMODEL_SHIELD, tmpSize, '1 1 1' * shield + '1 0 0' * (1 - shield), hudAlpha * shield, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, vehicleWeapon1, tmpSize, '1 1 1' * ammo1 + '1 0 0' * (1 - ammo1), hudAlpha, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, vehicleWeapon2, tmpSize, '1 1 1' * ammo2 + '1 0 0' * (1 - ammo2), hudAlpha, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, "vehicle_shield", tmpSize, '1 1 1' * shield + '1 0 0' * (1 - shield), hudAlpha * shield, DRAWFLAG_NORMAL); // Health bar tmpSize.y = hudSize.y / 2; @@ -260,13 +235,13 @@ void Vehicles_drawHUD( tmpPos.y = hudPos.y; drawsetcliparea(tmpPos.x + (tmpSize.x * (1 - health)), tmpPos.y, tmpSize.x, tmpSize.y); - drawpic(tmpPos, vBAR_HEALTH, tmpSize, autocvar_hud_progressbar_health_color, barAlpha, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, "vehicle_bar_northwest", tmpSize, autocvar_hud_progressbar_health_color, barAlpha, DRAWFLAG_NORMAL); // Shield bar tmpPos.y = hudPos.y + hudSize.y / 2; drawsetcliparea(tmpPos.x + (tmpSize.x * (1 - shield)), tmpPos.y, tmpSize.x, tmpSize.y); - drawpic(tmpPos, vBAR_SHIELD, tmpSize, autocvar_hud_progressbar_armor_color, barAlpha, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, "vehicle_bar_southwest", tmpSize, autocvar_hud_progressbar_armor_color, barAlpha, DRAWFLAG_NORMAL); // Ammo1 bar tmpPos.x = hudPos.x + hudSize.x * (480/768); @@ -277,7 +252,7 @@ void Vehicles_drawHUD( else drawsetcliparea(tmpPos.x, tmpPos.y, tmpSize.x * reload1, tmpSize.y); - drawpic(tmpPos, vBAR_AMMO1, tmpSize, colorAmmo1, barAlpha, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, "vehicle_bar_northeast", tmpSize, colorAmmo1, barAlpha, DRAWFLAG_NORMAL); // Ammo2 bar tmpPos.y = hudPos.y + hudSize.y / 2; @@ -287,13 +262,13 @@ void Vehicles_drawHUD( else drawsetcliparea(tmpPos.x, tmpPos.y, tmpSize.x * reload2, tmpSize.y); - drawpic(tmpPos, vBAR_AMMO2, tmpSize, colorAmmo2, barAlpha, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, "vehicle_bar_southeast", tmpSize, colorAmmo2, barAlpha, DRAWFLAG_NORMAL); drawresetcliparea(); // Health icon tmpSize.x = hudSize.x * (80/768); tmpSize.y = hudSize.y * (80/256); - tmpPos.x = hudPos.x + hudSize.x * (56/768); + tmpPos.x = hudPos.x + hudSize.x * (64/768); tmpPos.y = hudPos.y + hudSize.y * (48/256); if(health < 0.25) @@ -303,7 +278,7 @@ void Vehicles_drawHUD( alarm1time = time + 2; sound(self, CH_PAIN_SINGLE, "vehicles/alarm.wav", VOL_BASEVOICE, ATTEN_NONE); } - drawpic(tmpPos, vICON_HEALTH, tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, "vehicle_icon_health", tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL); } else { @@ -312,7 +287,7 @@ void Vehicles_drawHUD( sound(self, CH_PAIN_SINGLE, "misc/null.wav", VOL_BASEVOICE, ATTEN_NONE); alarm1time = 0; } - drawpic(tmpPos, vICON_HEALTH, tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, "vehicle_icon_health", tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL); } // Shield icon @@ -325,7 +300,7 @@ void Vehicles_drawHUD( alarm2time = time + 1; sound(self, CH_TRIGGER_SINGLE, "vehicles/alarm_shield.wav", VOL_BASEVOICE, ATTEN_NONE); } - drawpic(tmpPos, vICON_SHIELD, tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, "vehicle_icon_shield", tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL); } else { @@ -334,25 +309,25 @@ void Vehicles_drawHUD( sound(self, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_BASEVOICE, ATTEN_NONE); alarm2time = 0; } - drawpic(tmpPos, vICON_SHIELD, tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, "vehicle_icon_shield", tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL); } // Ammo1 icon - tmpPos.x = hudPos.x + hudSize.x * (632/768); + tmpPos.x = hudPos.x + hudSize.x * (624/768); tmpPos.y = hudPos.y + hudSize.y * (48/256); if(ammo1) - drawpic(tmpPos, iconAmmo1, tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, iconAmmo1, tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL); else - drawpic(tmpPos, iconAmmo1, tmpSize, '1 1 1', hudAlpha * 0.2, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, iconAmmo1, tmpSize, '1 1 1', hudAlpha * 0.2, DRAWFLAG_NORMAL); // Ammo2 icon tmpPos.y = hudPos.y + hudSize.y / 2; if(ammo2) - drawpic(tmpPos, iconAmmo2, tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, iconAmmo2, tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL); else - drawpic(tmpPos, iconAmmo2, tmpSize, '1 1 1', hudAlpha * 0.2, DRAWFLAG_NORMAL); + drawpic_skin(tmpPos, iconAmmo2, tmpSize, '1 1 1', hudAlpha * 0.2, DRAWFLAG_NORMAL); // Bumblebee gunner crosshairs if(hud == HUD_BUMBLEBEE) @@ -435,18 +410,18 @@ void Vehicles_drawHUD( void CSQC_BUMBLE_HUD() { - Vehicles_drawHUD(vMODEL_BUMBLE, vMODEL_BUMBLE_WEAPON1, vMODEL_BUMBLE_WEAPON2, - vICON_AMMO1, autocvar_hud_progressbar_vehicles_ammo1_color, - vICON_AMMO1, autocvar_hud_progressbar_vehicles_ammo1_color, + Vehicles_drawHUD("vehicle_bumble", "vehicle_bumble_weapon1", "vehicle_bumble_weapon2", + "vehicle_icon_ammo1", autocvar_hud_progressbar_vehicles_ammo1_color, + "vehicle_icon_ammo1", autocvar_hud_progressbar_vehicles_ammo1_color, vCROSS_HEAL); } void CSQC_BUMBLE_GUN_HUD() { - Vehicles_drawHUD(vMODEL_GUNNER, vMODEL_GUNNER_WEAPON1, vNULL, - vICON_AMMO1, autocvar_hud_progressbar_vehicles_ammo1_color, - vNULL, '0 0 0', - vNULL); + Vehicles_drawHUD("vehicle_gunner", "vehicle_gunner_weapon1", "null", + "vehicle_icon_ammo1", autocvar_hud_progressbar_vehicles_ammo1_color, + "null", '0 0 0', + "null"); } void CSQC_SPIDER_HUD() @@ -460,9 +435,9 @@ void CSQC_SPIDER_HUD() default: crosshair = vCROSS_TAG; } - Vehicles_drawHUD(vMODEL_SPIDER, vMODEL_SPIDER_WEAPON1, vMODEL_SPIDER_WEAPON2, - vICON_AMMO1, autocvar_hud_progressbar_vehicles_ammo1_color, - vICON_AMMO2, autocvar_hud_progressbar_vehicles_ammo2_color, + Vehicles_drawHUD("vehicle_spider", "vehicle_spider_weapon1", "vehicle_spider_weapon2", + "vehicle_icon_ammo1", autocvar_hud_progressbar_vehicles_ammo1_color, + "vehicle_icon_ammo2", autocvar_hud_progressbar_vehicles_ammo2_color, crosshair); } @@ -476,17 +451,17 @@ void CSQC_RAPTOR_HUD() default: crosshair = vCROSS_AIM; } - Vehicles_drawHUD(vMODEL_RAPTOR, vMODEL_RAPTOR_WEAPON1, vMODEL_RAPTOR_WEAPON2, - vICON_AMMO1, autocvar_hud_progressbar_vehicles_ammo1_color, - vICON_AMMO2, autocvar_hud_progressbar_vehicles_ammo2_color, + Vehicles_drawHUD("vehicle_raptor", "vehicle_raptor_weapon1", "vehicle_raptor_weapon2", + "vehicle_icon_ammo1", autocvar_hud_progressbar_vehicles_ammo1_color, + "vehicle_icon_ammo2", autocvar_hud_progressbar_vehicles_ammo2_color, crosshair); } void CSQC_WAKIZASHI_HUD() { - Vehicles_drawHUD(vMODEL_RACER, vMODEL_RACER_WEAPON1, vMODEL_RACER_WEAPON2, - vICON_AMMO1, autocvar_hud_progressbar_vehicles_ammo1_color, - vICON_AMMO2, autocvar_hud_progressbar_vehicles_ammo2_color, + Vehicles_drawHUD("vehicle_racer", "vehicle_racer_weapon1", "vehicle_racer_weapon2", + "vehicle_icon_ammo1", autocvar_hud_progressbar_vehicles_ammo1_color, + "vehicle_icon_ammo2", autocvar_hud_progressbar_vehicles_ammo2_color, vCROSS_AIM); }