Revise vehicle HUD images and make small updates to the HUD drawing function

diff --git a/gfx/vehicles/bar_dwn_left.tga b/gfx/vehicles/bar_dwn_left.tga
index 011f9a9c325245de9eb3e2f5f205d91863fd4514..2b65269c35dccc27836617dc062b938d5b9782e3 100644 (file)
Binary files a/gfx/vehicles/bar_dwn_left.tga and b/gfx/vehicles/bar_dwn_left.tga differ

diff --git a/gfx/vehicles/bar_dwn_right.tga b/gfx/vehicles/bar_dwn_right.tga
index e93b5e60011dba96763a89f68487718c452dcb07..82fb43f895cc1d5070d54966983b9f75ce6148dc 100644 (file)
Binary files a/gfx/vehicles/bar_dwn_right.tga and b/gfx/vehicles/bar_dwn_right.tga differ

diff --git a/gfx/vehicles/bar_up_left.tga b/gfx/vehicles/bar_up_left.tga
index f49d205d0d457d75e9c36fddd95cfe7ed4e0d94d..4c814616378387520efeedc30e65fa4c0402c7f5 100644 (file)
Binary files a/gfx/vehicles/bar_up_left.tga and b/gfx/vehicles/bar_up_left.tga differ

diff --git a/gfx/vehicles/bar_up_right.tga b/gfx/vehicles/bar_up_right.tga
index a3b5910140f3847d7506fdfb640253ed19b5a592..de9fea79bd1f6e145bd5611951bbc8d3c29e598e 100644 (file)
Binary files a/gfx/vehicles/bar_up_right.tga and b/gfx/vehicles/bar_up_right.tga differ

diff --git a/gfx/vehicles/bullets.tga b/gfx/vehicles/bullets.tga
index ff853ee6b870d9e4184a38b41e76e59b006ffeda..ae90b9efab233a10353d6db92a66aa3c01a82f53 100644 (file)
Binary files a/gfx/vehicles/bullets.tga and b/gfx/vehicles/bullets.tga differ

diff --git a/gfx/vehicles/bumb.tga b/gfx/vehicles/bumb.tga
index 22883f40e161dea09cc3ff953abdc6975b659e7d..a9fc38a7c3d906b23a4e680aaabf5911f6635741 100644 (file)
Binary files a/gfx/vehicles/bumb.tga and b/gfx/vehicles/bumb.tga differ

diff --git a/gfx/vehicles/bumb_lgun.tga b/gfx/vehicles/bumb_lgun.tga
index 23db1da64e0878db5a890233728ff034c333fba3..546306520b1d852fcfd7b03ae9017e786ca7f23d 100644 (file)
Binary files a/gfx/vehicles/bumb_lgun.tga and b/gfx/vehicles/bumb_lgun.tga differ

diff --git a/gfx/vehicles/bumb_rgun.tga b/gfx/vehicles/bumb_rgun.tga
index f755681ee0104db8cdaa2bb6696f36a7a6e50c27..628c44af5988337177e04dea2571a024c6e56c3f 100644 (file)
Binary files a/gfx/vehicles/bumb_rgun.tga and b/gfx/vehicles/bumb_rgun.tga differ

diff --git a/gfx/vehicles/bumb_side.tga b/gfx/vehicles/bumb_side.tga
index 69fa4d81420300a8539d129ec2a9d3d3ad0a4d0c..7068ffe6bf276bc3a828178f552c588ef0e2c4a0 100644 (file)
Binary files a/gfx/vehicles/bumb_side.tga and b/gfx/vehicles/bumb_side.tga differ

diff --git a/gfx/vehicles/bumb_side_gun.tga b/gfx/vehicles/bumb_side_gun.tga
index c8fc81702d196568b03506922f7e5c3c62ec0cac..31e5457dfbabe9a8c12594a56ab7b65c6d7f6f59 100644 (file)
Binary files a/gfx/vehicles/bumb_side_gun.tga and b/gfx/vehicles/bumb_side_gun.tga differ

diff --git a/gfx/vehicles/frame.tga b/gfx/vehicles/frame.tga
index 92a657361bf8de5e0dc8c26e6123ab536c368d5c..882bd5cbcf08d219a43d27f332492fcb9f234a79 100644 (file)
Binary files a/gfx/vehicles/frame.tga and b/gfx/vehicles/frame.tga differ

diff --git a/gfx/vehicles/health.tga b/gfx/vehicles/health.tga
index 3956a3ff21ce3b64447aab799d10254cb5263668..56ba0f1c9f345884c85fa4ddb2352fa332913969 100644 (file)
Binary files a/gfx/vehicles/health.tga and b/gfx/vehicles/health.tga differ

diff --git a/gfx/vehicles/raptor.tga b/gfx/vehicles/raptor.tga
index 9a2519a95c81b1d311864aaa321eab97d403cfdc..78b9f7d311c2ed7e679a7ee55b1c39aa4cacff2e 100644 (file)
Binary files a/gfx/vehicles/raptor.tga and b/gfx/vehicles/raptor.tga differ

diff --git a/gfx/vehicles/raptor_bombs.tga b/gfx/vehicles/raptor_bombs.tga
index 9012fb259968cc005332f51312415898e4a7076e..1aff0d4f21715f346a7ea897be7b9d4a037017fd 100644 (file)
Binary files a/gfx/vehicles/raptor_bombs.tga and b/gfx/vehicles/raptor_bombs.tga differ

diff --git a/gfx/vehicles/raptor_guns.tga b/gfx/vehicles/raptor_guns.tga
index 0d0012a53dace2ab265ac44aa1f3bde5944a78db..68491d1fe7fa2e62129fea2dd6fedb82bf6d2cff 100644 (file)
Binary files a/gfx/vehicles/raptor_guns.tga and b/gfx/vehicles/raptor_guns.tga differ

diff --git a/gfx/vehicles/rocket.tga b/gfx/vehicles/rocket.tga
index f0385b97f9cbc8923a35319354344768d6c5f564..14a64b7e1640fee19e86cd8d69d5d256e6ce40d5 100644 (file)
Binary files a/gfx/vehicles/rocket.tga and b/gfx/vehicles/rocket.tga differ

diff --git a/gfx/vehicles/sbot.tga b/gfx/vehicles/sbot.tga
index 706c87ec2fa15ca66db81ca08254c85ad1b73821..f49d32ba8a4a00ee4e07f74b5bef7f28aaad7130 100644 (file)
Binary files a/gfx/vehicles/sbot.tga and b/gfx/vehicles/sbot.tga differ

diff --git a/gfx/vehicles/sbot_mguns.tga b/gfx/vehicles/sbot_mguns.tga
index a6816f90312a0a86839c3bce28312452fa287899..660b5b3c4390f3e9d0910ce1a49e6ff169017946 100644 (file)
Binary files a/gfx/vehicles/sbot_mguns.tga and b/gfx/vehicles/sbot_mguns.tga differ

diff --git a/gfx/vehicles/sbot_rpods.tga b/gfx/vehicles/sbot_rpods.tga
index 2170960ebaf563962dd10740bfa71a71affc887f..0382a3db098c294915203baf90a5fa2cbd95a339 100644 (file)
Binary files a/gfx/vehicles/sbot_rpods.tga and b/gfx/vehicles/sbot_rpods.tga differ

diff --git a/gfx/vehicles/shield.tga b/gfx/vehicles/shield.tga
index 916268f05e80318019e0a8a59fc62c9c55818f03..82c8369b2e47a040d19e233454afaa8b0db9c2bc 100644 (file)
Binary files a/gfx/vehicles/shield.tga and b/gfx/vehicles/shield.tga differ

diff --git a/gfx/vehicles/template.png b/gfx/vehicles/template.png
new file mode 100644 (file)
index 0000000..227200f
Binary files /dev/null and b/gfx/vehicles/template.png differ

diff --git a/gfx/vehicles/vh-shield.tga b/gfx/vehicles/vh-shield.tga
index bd728e28384102ae2b06238b8303cff60728a275..5b7570a5506a11e1fcd04895b3b8e12583ddc527 100644 (file)
Binary files a/gfx/vehicles/vh-shield.tga and b/gfx/vehicles/vh-shield.tga differ

diff --git a/gfx/vehicles/waki.tga b/gfx/vehicles/waki.tga
index 10089d23e2e4869b90be0d3f986db7e4ede68389..2d6e0ff904dd8adf492858a748df4f21f85aef0c 100644 (file)
Binary files a/gfx/vehicles/waki.tga and b/gfx/vehicles/waki.tga differ

diff --git a/gfx/vehicles/waki_guns.tga b/gfx/vehicles/waki_guns.tga
index 2b0705e60ebe1c22d5b50737ac66990101f89ada..3d0c56e2f11c2a69afbfefa833e137325d0e8e7e 100644 (file)
Binary files a/gfx/vehicles/waki_guns.tga and b/gfx/vehicles/waki_guns.tga differ

diff --git a/gfx/vehicles/waki_rockets.tga b/gfx/vehicles/waki_rockets.tga
index 538243c011df2117c504f70e58bf21ad39f7e64a..d79175ae2c6c766c461026743604bc5dc37956ae 100644 (file)
Binary files a/gfx/vehicles/waki_rockets.tga and b/gfx/vehicles/waki_rockets.tga differ

diff --git a/qcsrc/client/vehicles/all.qc b/qcsrc/client/vehicles/all.qc
index a4736687a6280ee020686191351ad21df8148771..255b2ff58de35578fae4bc3a1193351792bcbef8 100644 (file)
--- a/qcsrc/client/vehicles/all.qc
+++ b/qcsrc/client/vehicles/all.qc
@@ -247,11 +247,11 @@ void Vehicles_drawHUD(
 
        drawpic(tmpPos, modelWeapon1, tmpSize, '1 1 1' * ammo1 + '1 0 0' * (1 - ammo1), 1, DRAWFLAG_NORMAL);
        drawpic(tmpPos, modelWeapon2, tmpSize, '1 1 1' * ammo2 + '1 0 0' * (1 - ammo2), 1, DRAWFLAG_NORMAL);
-       drawpic(tmpPos, vMODEL_SHIELD, tmpSize, '1 1 1', shield, DRAWFLAG_NORMAL);
+       drawpic(tmpPos, vMODEL_SHIELD, tmpSize, '1 1 1' * shield + '1 0 0' * (1 - shield), shield, DRAWFLAG_NORMAL);
 
        // Health bar
        tmpSize.y = hudSize.y / 2;
-       tmpPos.x  = hudPos.x + hudSize.x / 24;
+       tmpPos.x  = hudPos.x + hudSize.x * (32/768);
        tmpPos.y  = hudPos.y;
 
        drawsetcliparea(tmpPos.x + (tmpSize.x * (1 - health)), tmpPos.y, tmpSize.x, tmpSize.y);
@@ -264,7 +264,7 @@ void Vehicles_drawHUD(
        drawpic(tmpPos, vBAR_SHIELD, tmpSize, '1 1 1', 1, DRAWFLAG_NORMAL);
 
        // Ammo1 bar
-       tmpPos.x = hudPos.x + hudSize.x / 1.6;
+       tmpPos.x = hudPos.x + hudSize.x * (480/768);
        tmpPos.y = hudPos.y;
 
        if(ammo1)
@@ -286,10 +286,10 @@ void Vehicles_drawHUD(
        drawresetcliparea();
 
        // Health icon
-       tmpSize.x = hudSize.x / 6;
-       tmpSize.y = hudSize.y / 2;
-       tmpPos.x  = hudPos.x + hudSize.x / 24;
-       tmpPos.y  = hudPos.y;
+       tmpSize.x = hudSize.x * (80/768);
+       tmpSize.y = hudSize.y * (80/256);
+       tmpPos.x  = hudPos.x + hudSize.x * (56/768);
+       tmpPos.y  = hudPos.y + hudSize.y * (48/256);
 
        if(health < 0.25)
        {
@@ -333,21 +333,21 @@ void Vehicles_drawHUD(
        }
 
        // Ammo1 icon
-       tmpPos.x = hudPos.x + hudSize.x * 19 / 24;
-       tmpPos.y = hudPos.y;
+       tmpPos.x = hudPos.x + hudSize.x * (632/768);
+       tmpPos.y = hudPos.y + hudSize.y * (48/256);
 
        if(ammo1)
-               drawpic(tmpPos, vICON_AMMO1, tmpSize, '1 1 1', 1, DRAWFLAG_NORMAL);
+               drawpic(tmpPos, iconAmmo1, tmpSize, '1 1 1', 1, DRAWFLAG_NORMAL);
        else
-               drawpic(tmpPos, vICON_AMMO1, tmpSize, '1 1 1', 0.25, DRAWFLAG_NORMAL);
+               drawpic(tmpPos, iconAmmo1, tmpSize, '1 1 1', 0.2, DRAWFLAG_NORMAL);
 
        // Ammo2 icon
        tmpPos.y = hudPos.y + hudSize.y / 2;
 
        if(ammo2)
-               drawpic(tmpPos, vICON_AMMO2, tmpSize, '1 1 1', 1, DRAWFLAG_NORMAL);
+               drawpic(tmpPos, iconAmmo2, tmpSize, '1 1 1', 1, DRAWFLAG_NORMAL);
        else
-               drawpic(tmpPos, vICON_AMMO2, tmpSize, '1 1 1', 0.25, DRAWFLAG_NORMAL);
+               drawpic(tmpPos, iconAmmo2, tmpSize, '1 1 1', 0.2, DRAWFLAG_NORMAL);
 
        // Crosshair
        tmpSize  = draw_getimagesize(crosshair) * autocvar_cl_vehicles_crosshair_size;
@@ -360,17 +360,17 @@ void Vehicles_drawHUD(
        if(shouldDrawBumbleGunnerCrosshair)
        {
                tmpSize = '1 1 1' * hud_fontsize;
-               tmpPos.x = hudPos.x + hudSize.x / 1.5;
+               tmpPos.x = hudPos.x + hudSize.x * (520/768);
 
                if(!AuxiliaryXhairs[1].draw2d)
                {
-                       tmpPos.y = hudPos.y + hudSize.y / 2 - hudSize.y / 10 - tmpSize.y;
+                       tmpPos.y = hudPos.y + hudSize.y * (96/256) - tmpSize.y;
                        drawstring(tmpPos, _("No right gunner!"), tmpSize, '1 1 1', blinkValue, DRAWFLAG_NORMAL);
                }
 
                if(!AuxiliaryXhairs[2].draw2d)
                {
-                       tmpPos.y = hudPos.y + hudSize.y / 2 + hudSize.y / 10;
+                       tmpPos.y = hudPos.y + hudSize.y * (160/256);
                        drawstring(tmpPos, _("No left gunner!"), tmpSize, '1 1 1', blinkValue, DRAWFLAG_NORMAL);
                }
        }