X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fvehicles%2Fvehicles.qc;h=b7eabced273c8f885315e9e8f0abf1d8c326312c;hb=b186e36be65d9d9c15f5aa496a7cff13ec487225;hp=8041bcb3e1da7653fc9146dfc069c63e74798d27;hpb=f2a79cba0897fb6f6cb7ebeecb596b5547af3ddd;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/vehicles/vehicles.qc b/qcsrc/client/vehicles/vehicles.qc index 8041bcb3e..b7eabced2 100644 --- a/qcsrc/client/vehicles/vehicles.qc +++ b/qcsrc/client/vehicles/vehicles.qc @@ -30,11 +30,25 @@ const var void Draw_Not(); .float axh_drawflag; .float axh_scale; +#define spider_ico "gfx/vehicles/sbot.tga" +#define spider_rkt "gfx/vehicles/sbot_rpods.tga" +#define spider_mgun "gfx/vehicles/sbot_mguns.tga" +#define spider_xhair "gfx/vehicles/axh-special1.tga" + +#define waki_ico "gfx/vehicles/waki.tga" +#define waki_eng "gfx/vehicles/waki_e.tga" +#define waki_gun "gfx/vehicles/waki_guns.tga" +#define waki_rkt "gfx/vehicles/waki_rockets.tga" +#define waki_xhair "gfx/vehicles/axh-special1.tga" + +float alarm1time; +float alarm2time; + void AuxiliaryXhair_Draw2D() { vector loc, psize; - psize = self.axh_scale * drawgetimagesize(self.axh_image); + psize = self.axh_scale * draw_getimagesize(self.axh_image); loc = project_3d_to_2d(self.origin) - 0.5 * psize; if not (loc_z < 0 || loc_x < 0 || loc_y < 0 || loc_x > vid_conwidth || loc_y > vid_conheight) { @@ -84,7 +98,19 @@ void Net_VehicleSetup() { float hud_id, i; - hud_id = bound(HUD_SPIDERBOT, ReadByte(), HUD_RAPTOR); + + hud_id = ReadByte(); + + // hud_id == 0 means we exited a vehicle, so stop alarm sound/s + if(hud_id == 0) + { + sound(self, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_BASEVOICE, ATTN_NONE); + sound(self, CH_PAIN_SINGLE, "misc/null.wav", VOL_BASEVOICE, ATTN_NONE); + + return; + } + + hud_id = bound(HUD_SPIDERBOT, hud_id, HUD_RAPTOR); // Init auxiliary crosshairs entity axh; @@ -156,15 +182,143 @@ void Net_VehicleSetup() void CSQC_BUMBLE_HUD() { +/* + drawpic(hudloc, waki_s, picsize, '1 1 1', shield, DRAWFLAG_NORMAL); + drawpic(hudloc, waki_b, picsize, '0 1 0' * health + '1 0 0' * (1 - health), 1, DRAWFLAG_NORMAL); + drawpic(hudloc, waki_r, picsize, '1 1 1' * reload1 + '1 0 0' * (1 - reload1), 1, DRAWFLAG_NORMAL); + drawpic(hudloc, waki_e, picsize, '1 1 1' * energy + '1 0 0' * (1 - energy), 1, DRAWFLAG_NORMAL); +*/ + if(autocvar_r_letterbox) + return; + + vector picsize, hudloc, pic2size, picloc; + + // Fetch health & ammo stats + HUD_GETSTATS + + picsize = draw_getimagesize(hud_bg) * autocvar_cl_vehicles_hudscale; + hudloc_y = vid_conheight - picsize_y; + hudloc_x = vid_conwidth * 0.5 - picsize_x * 0.5; + + drawpic(hudloc, hud_bg, picsize, '1 1 1', autocvar_cl_vehicles_hudalpha, DRAWFLAG_NORMAL); + + shield *= 0.01; + vh_health *= 0.01; + energy *= 0.01; + reload1 *= 0.01; + + pic2size = draw_getimagesize(spider_ico) * (autocvar_cl_vehicles_hudscale * 0.8); + picloc = picsize * 0.5 - pic2size * 0.5; + if(vh_health < 0.25) + drawpic(hudloc + picloc, waki_ico, pic2size, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); + else + drawpic(hudloc + picloc, waki_ico, pic2size, '1 1 1' * vh_health + '1 0 0' * (1 - vh_health), 1, DRAWFLAG_NORMAL); + drawpic(hudloc + picloc, waki_eng, pic2size, '1 1 1' * energy + '1 0 0' * (1 - energy), 1, DRAWFLAG_NORMAL); + drawpic(hudloc + picloc, waki_gun, pic2size, '1 1 1' * energy + '1 0 0' * (1 - energy), 1, DRAWFLAG_NORMAL); + drawpic(hudloc + picloc, waki_rkt, pic2size, '1 1 1' * reload1 + '1 0 0' * (1 - reload1), 1, DRAWFLAG_NORMAL); + drawpic(hudloc + picloc, hud_sh, pic2size, '1 1 1', shield, DRAWFLAG_NORMAL); + +// Health bar + picsize = draw_getimagesize(hud_hp_bar) * autocvar_cl_vehicles_hudscale; + picloc = '69 69 0' * autocvar_cl_vehicles_hudscale; + drawsetcliparea(hudloc_x + picloc_x + (picsize_x * (1 - vh_health)), 0, vid_conwidth, vid_conheight); + drawpic(hudloc + picloc, hud_hp_bar, picsize, '1 1 1', 1 , DRAWFLAG_NORMAL); + drawresetcliparea(); +// .. and icon + picsize = draw_getimagesize(hud_hp_ico) * autocvar_cl_vehicles_hudscale; + picloc = '37 65 0' * autocvar_cl_vehicles_hudscale; + if(vh_health < 0.25) + { + if(alarm1time < time) + { + alarm1time = time + 2; + sound(self, CH_PAIN_SINGLE, "vehicles/alarm.wav", VOL_BASEVOICE, ATTN_NONE); + } + + drawpic(hudloc + picloc, hud_hp_ico, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); + } + else + { + drawpic(hudloc + picloc, hud_hp_ico, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); + if(alarm1time) + { + sound(self, CH_PAIN_SINGLE, "misc/null.wav", VOL_BASEVOICE, ATTN_NONE); + alarm1time = 0; + } + } + + +// Shield bar + picsize = draw_getimagesize(hud_sh_bar) * autocvar_cl_vehicles_hudscale; + picloc = '69 140 0' * autocvar_cl_vehicles_hudscale; + drawsetcliparea(hudloc_x + picloc_x + (picsize_x * (1 - shield)), 0, vid_conwidth, vid_conheight); + drawpic(hudloc + picloc, hud_sh_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); + drawresetcliparea(); +// .. and icon + picloc = '40 136 0' * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_sh_ico) * autocvar_cl_vehicles_hudscale; + if(shield < 0.25) + { + if(alarm2time < time) + { + alarm2time = time + 1; + sound(self, CH_TRIGGER_SINGLE, "vehicles/alarm_shield.wav", VOL_BASEVOICE, ATTN_NONE); + } + drawpic(hudloc + picloc, hud_sh_ico, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); + } + else + { + drawpic(hudloc + picloc, hud_sh_ico, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); + if(alarm2time) + { + sound(self, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_BASEVOICE, ATTN_NONE); + alarm2time = 0; + } + } + +// Gun bar + picsize = draw_getimagesize(hud_ammo1_bar) * autocvar_cl_vehicles_hudscale; + picloc = '450 69 0' * autocvar_cl_vehicles_hudscale; + drawsetcliparea(hudloc_x + picloc_x, picloc_y, picsize_x * energy, vid_conheight); + drawpic(hudloc + picloc, hud_ammo1_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); + drawresetcliparea(); +// .. and icon + picsize = draw_getimagesize(hud_ammo1_ico) * autocvar_cl_vehicles_hudscale; + picloc = '664 60 0' * autocvar_cl_vehicles_hudscale; + if(energy < 0.2) + drawpic(hudloc + picloc, hud_ammo1_ico, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); + else + drawpic(hudloc + picloc, hud_ammo1_ico, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); + +// Bomb bar + picsize = draw_getimagesize(hud_ammo2_bar) * autocvar_cl_vehicles_hudscale; + picloc = '450 140 0' * autocvar_cl_vehicles_hudscale; + drawsetcliparea(hudloc_x + picloc_x, hudloc_y + picloc_y, picsize_x * reload1, vid_conheight); + drawpic(hudloc + picloc, hud_ammo2_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); + drawresetcliparea(); +// .. and icon + pic2size = draw_getimagesize(hud_ammo2_ico) * autocvar_cl_vehicles_hudscale; + picloc = '664 130 0' * autocvar_cl_vehicles_hudscale; + if(reload1 != 1) + drawpic(hudloc + picloc, hud_ammo2_ico, pic2size, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); + else + drawpic(hudloc + picloc, hud_ammo2_ico, pic2size, '1 1 1', 1, DRAWFLAG_NORMAL); + + if (scoreboard_showscores) + HUD_DrawScoreboard(); + else + { + picsize = draw_getimagesize(waki_xhair); + picsize_x *= 0.5; + picsize_y *= 0.5; + + + drawpic('0.5 0 0' * (vid_conwidth - picsize_x) + '0 0.5 0' * (vid_conheight - picsize_y), waki_xhair, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); + } } -#define spider_ico "gfx/vehicles/sbot.tga" -#define spider_rkt "gfx/vehicles/sbot_rpods.tga" -#define spider_mgun "gfx/vehicles/sbot_mguns.tga" -#define spider_xhair "gfx/vehicles/axh-special1.tga" -float alarm1time; -float alarm2time; + void CSQC_SPIDER_HUD() { @@ -177,23 +331,18 @@ void CSQC_SPIDER_HUD() // Fetch health & ammo stats HUD_GETSTATS - picsize = drawgetimagesize(hud_bg) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_bg) * autocvar_cl_vehicles_hudscale; hudloc_y = vid_conheight - picsize_y; hudloc_x = vid_conwidth * 0.5 - picsize_x * 0.5; drawpic(hudloc, hud_bg, picsize, '1 1 1', autocvar_cl_vehicles_hudalpha, DRAWFLAG_NORMAL); - //drawstring(hudloc + '145 19 0', strcat(ftos(vh_health), "%"),'15 15 0','0 1 0', 1, DRAWFLAG_NORMAL); - //drawstring(hudloc + '175 34 0', strcat(ftos(shield), "%"),'15 15 0','0 0 1', 1, DRAWFLAG_NORMAL); - //drawstring(hudloc + '136 102 0', strcat(ftos(ammo1), "%"),'14 14 0','1 1 0', 1, DRAWFLAG_NORMAL); - //drawstring(hudloc + '179 69 0', strcat(ftos(9 - ammo2), " / 8"),'14 14 0','1 1 0', 1, DRAWFLAG_NORMAL); - ammo1 *= 0.01; shield *= 0.01; vh_health *= 0.01; reload2 *= 0.01; - pic2size = drawgetimagesize(spider_ico) * (autocvar_cl_vehicles_hudscale * 0.8); + pic2size = draw_getimagesize(spider_ico) * (autocvar_cl_vehicles_hudscale * 0.8); picloc = picsize * 0.5 - pic2size * 0.5; if(vh_health < 0.25) drawpic(hudloc + picloc, spider_ico, pic2size, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); @@ -204,20 +353,20 @@ void CSQC_SPIDER_HUD() drawpic(hudloc + picloc, hud_sh, pic2size, '1 1 1', shield, DRAWFLAG_NORMAL); // Health bar - picsize = drawgetimagesize(hud_hp_bar) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_hp_bar) * autocvar_cl_vehicles_hudscale; picloc = '69 69 0' * autocvar_cl_vehicles_hudscale; drawsetcliparea(hudloc_x + picloc_x + (picsize_x * (1 - vh_health)), 0, vid_conwidth, vid_conheight); drawpic(hudloc + picloc, hud_hp_bar, picsize, '1 1 1', 1 , DRAWFLAG_NORMAL); drawresetcliparea(); // .. and icon - picsize = drawgetimagesize(hud_hp_ico) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_hp_ico) * autocvar_cl_vehicles_hudscale; picloc = '37 65 0' * autocvar_cl_vehicles_hudscale; if(vh_health < 0.25) { if(alarm1time < time) { alarm1time = time + 2; - sound(world, CH_PAIN, "vehicles/alarm.wav", VOL_BASEVOICE, ATTN_NONE); + sound(self, CH_PAIN_SINGLE, "vehicles/alarm.wav", VOL_BASEVOICE, ATTN_NONE); } drawpic(hudloc + picloc, hud_hp_ico, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); } @@ -226,25 +375,25 @@ void CSQC_SPIDER_HUD() drawpic(hudloc + picloc, hud_hp_ico, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); if(alarm1time) { - sound(world, CH_PAIN, "misc/null.wav", VOL_BASEVOICE, ATTN_NONE); + sound(self, CH_PAIN_SINGLE, "misc/null.wav", VOL_BASEVOICE, ATTN_NONE); alarm1time = 0; } } // Shield bar - picsize = drawgetimagesize(hud_sh_bar) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_sh_bar) * autocvar_cl_vehicles_hudscale; picloc = '69 140 0' * autocvar_cl_vehicles_hudscale; drawsetcliparea(hudloc_x + picloc_x + (picsize_x * (1 - shield)), 0, vid_conwidth, vid_conheight); drawpic(hudloc + picloc, hud_sh_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); drawresetcliparea(); // .. and icon picloc = '40 136 0' * autocvar_cl_vehicles_hudscale; - picsize = drawgetimagesize(hud_sh_ico) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_sh_ico) * autocvar_cl_vehicles_hudscale; if(shield < 0.25) { if(alarm2time < time) { alarm2time = time + 1; - sound(world, CH_TRIGGER_SINGLE, "vehicles/alarm_shield.wav", VOL_BASEVOICE, ATTN_NONE); + sound(self, CH_TRIGGER_SINGLE, "vehicles/alarm_shield.wav", VOL_BASEVOICE, ATTN_NONE); } drawpic(hudloc + picloc, hud_sh_ico, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); } @@ -253,20 +402,20 @@ void CSQC_SPIDER_HUD() drawpic(hudloc + picloc, hud_sh_ico, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); if(alarm2time) { - sound(world, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_BASEVOICE, ATTN_NONE); + sound(self, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_BASEVOICE, ATTN_NONE); alarm2time = 0; } } // Minigun bar - picsize = drawgetimagesize(hud_ammo1_bar) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_ammo1_bar) * autocvar_cl_vehicles_hudscale; picloc = '450 69 0' * autocvar_cl_vehicles_hudscale; drawsetcliparea(hudloc_x + picloc_x, picloc_y, picsize_x * ammo1, vid_conheight); drawpic(hudloc + picloc, hud_ammo1_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); drawresetcliparea(); // .. and icon - picsize = drawgetimagesize(hud_ammo1_ico) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_ammo1_ico) * autocvar_cl_vehicles_hudscale; picloc = '664 60 0' * autocvar_cl_vehicles_hudscale; if(ammo1 < 0.2) drawpic(hudloc + picloc, hud_ammo1_ico, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); @@ -274,7 +423,7 @@ void CSQC_SPIDER_HUD() drawpic(hudloc + picloc, hud_ammo1_ico, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); // Rocket ammo bar - picsize = drawgetimagesize(hud_ammo2_bar) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_ammo2_bar) * autocvar_cl_vehicles_hudscale; ammo1 = picsize_x / 8; picloc = '450 140 0' * autocvar_cl_vehicles_hudscale; drawsetcliparea(hudloc_x + picloc_x, hudloc_y + picloc_y, picsize_x * reload2, vid_conheight); @@ -282,7 +431,7 @@ void CSQC_SPIDER_HUD() drawresetcliparea(); // .. and icons - pic2size = 0.35 * drawgetimagesize(hud_ammo2_ico) * autocvar_cl_vehicles_hudscale; + pic2size = 0.35 * draw_getimagesize(hud_ammo2_ico) * autocvar_cl_vehicles_hudscale; picloc_x -= pic2size_x; picloc_y += pic2size_y * 2.25; if(ammo2 == 9) @@ -301,7 +450,7 @@ void CSQC_SPIDER_HUD() drawpic(hudloc + picloc, hud_ammo2_ico, pic2size, ((i >= ammo2) ? '1 1 1' : '0 0 0'), 0.75, DRAWFLAG_NORMAL); } } - pic2size = drawgetimagesize(hud_ammo2_ico) * autocvar_cl_vehicles_hudscale; + pic2size = draw_getimagesize(hud_ammo2_ico) * autocvar_cl_vehicles_hudscale; picloc = '664 130 0' * autocvar_cl_vehicles_hudscale; if(ammo2 == 9) drawpic(hudloc + picloc, hud_ammo2_ico, pic2size, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); @@ -312,7 +461,7 @@ void CSQC_SPIDER_HUD() HUD_DrawScoreboard(); else { - picsize = drawgetimagesize(spider_xhair); + picsize = draw_getimagesize(spider_xhair); picsize_x *= autocvar_cl_vehicle_spiderbot_cross_size; picsize_y *= autocvar_cl_vehicle_spiderbot_cross_size; @@ -335,7 +484,7 @@ void CSQC_RAPTOR_HUD() // Fetch health & ammo stats HUD_GETSTATS - picsize = drawgetimagesize(hud_bg) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_bg) * autocvar_cl_vehicles_hudscale; hudloc_y = vid_conheight - picsize_y; hudloc_x = vid_conwidth * 0.5 - picsize_x * 0.5; @@ -349,7 +498,7 @@ void CSQC_RAPTOR_HUD() reload1 = reload2 * 0.01; //reload2 *= 0.01; - pic2size = drawgetimagesize(spider_ico) * (autocvar_cl_vehicles_hudscale * 0.8); + pic2size = draw_getimagesize(spider_ico) * (autocvar_cl_vehicles_hudscale * 0.8); picloc = picsize * 0.5 - pic2size * 0.5; if(vh_health < 0.25) drawpic(hudloc + picloc, raptor_ico, pic2size, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); @@ -360,13 +509,13 @@ void CSQC_RAPTOR_HUD() drawpic(hudloc + picloc, hud_sh, pic2size, '1 1 1', shield, DRAWFLAG_NORMAL); // Health bar - picsize = drawgetimagesize(hud_hp_bar) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_hp_bar) * autocvar_cl_vehicles_hudscale; picloc = '69 69 0' * autocvar_cl_vehicles_hudscale; drawsetcliparea(hudloc_x + picloc_x + (picsize_x * (1 - vh_health)), 0, vid_conwidth, vid_conheight); drawpic(hudloc + picloc, hud_hp_bar, picsize, '1 1 1', 1 , DRAWFLAG_NORMAL); drawresetcliparea(); // .. and icon - picsize = drawgetimagesize(hud_hp_ico) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_hp_ico) * autocvar_cl_vehicles_hudscale; picloc = '37 65 0' * autocvar_cl_vehicles_hudscale; if(vh_health < 0.25) { @@ -389,20 +538,20 @@ void CSQC_RAPTOR_HUD() } // Shield bar - picsize = drawgetimagesize(hud_sh_bar) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_sh_bar) * autocvar_cl_vehicles_hudscale; picloc = '69 140 0' * autocvar_cl_vehicles_hudscale; drawsetcliparea(hudloc_x + picloc_x + (picsize_x * (1 - shield)), 0, vid_conwidth, vid_conheight); drawpic(hudloc + picloc, hud_sh_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); drawresetcliparea(); // .. and icon picloc = '40 136 0' * autocvar_cl_vehicles_hudscale; - picsize = drawgetimagesize(hud_sh_ico) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_sh_ico) * autocvar_cl_vehicles_hudscale; if(shield < 0.25) { if(alarm2time < time) { alarm2time = time + 1; - sound(world, CH_TRIGGER_SINGLE, "vehicles/alarm_shield.wav", VOL_BASEVOICE, ATTN_NONE); + sound(self, CH_TRIGGER_SINGLE, "vehicles/alarm_shield.wav", VOL_BASEVOICE, ATTN_NONE); } drawpic(hudloc + picloc, hud_sh_ico, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); } @@ -411,19 +560,19 @@ void CSQC_RAPTOR_HUD() drawpic(hudloc + picloc, hud_sh_ico, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); if(alarm2time) { - sound(world, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_BASEVOICE, ATTN_NONE); + sound(self, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_BASEVOICE, ATTN_NONE); alarm2time = 0; } } // Gun bar - picsize = drawgetimagesize(hud_ammo1_bar) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_ammo1_bar) * autocvar_cl_vehicles_hudscale; picloc = '450 69 0' * autocvar_cl_vehicles_hudscale; drawsetcliparea(hudloc_x + picloc_x, picloc_y, picsize_x * energy, vid_conheight); drawpic(hudloc + picloc, hud_ammo1_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); drawresetcliparea(); // .. and icon - picsize = drawgetimagesize(hud_ammo1_ico) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_ammo1_ico) * autocvar_cl_vehicles_hudscale; picloc = '664 60 0' * autocvar_cl_vehicles_hudscale; if(energy < 0.2) drawpic(hudloc + picloc, hud_ammo1_ico, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); @@ -431,13 +580,13 @@ void CSQC_RAPTOR_HUD() drawpic(hudloc + picloc, hud_ammo1_ico, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); // Bomb bar - picsize = drawgetimagesize(hud_ammo2_bar) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_ammo2_bar) * autocvar_cl_vehicles_hudscale; picloc = '450 140 0' * autocvar_cl_vehicles_hudscale; drawsetcliparea(hudloc_x + picloc_x, hudloc_y + picloc_y, picsize_x * reload1, vid_conheight); drawpic(hudloc + picloc, hud_ammo2_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); drawresetcliparea(); // .. and icon - pic2size = drawgetimagesize(hud_ammo2_ico) * autocvar_cl_vehicles_hudscale; + pic2size = draw_getimagesize(hud_ammo2_ico) * autocvar_cl_vehicles_hudscale; picloc = '664 130 0' * autocvar_cl_vehicles_hudscale; if(reload1 != 1) drawpic(hudloc + picloc, hud_ammo2_ico, pic2size, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); @@ -463,7 +612,7 @@ void CSQC_RAPTOR_HUD() where = project_3d_to_2d(trace_endpos); setorigin(dropmark, trace_endpos); - picsize = drawgetimagesize(raptor_drop) * 0.2; + picsize = draw_getimagesize(raptor_drop) * 0.2; if not (where_z < 0 || where_x < 0 || where_y < 0 || where_x > vid_conwidth || where_y > vid_conheight) { @@ -480,7 +629,7 @@ void CSQC_RAPTOR_HUD() if(dropmark.cnt > time) { where = project_3d_to_2d(dropmark.origin); - picsize = drawgetimagesize(raptor_drop) * 0.25; + picsize = draw_getimagesize(raptor_drop) * 0.25; if not (where_z < 0 || where_x < 0 || where_y < 0 || where_x > vid_conwidth || where_y > vid_conheight) { @@ -496,7 +645,7 @@ void CSQC_RAPTOR_HUD() HUD_DrawScoreboard(); else { - picsize = drawgetimagesize(raptor_xhair); + picsize = draw_getimagesize(raptor_xhair); picsize_x *= 0.5; picsize_y *= 0.5; @@ -504,11 +653,6 @@ void CSQC_RAPTOR_HUD() } } -#define waki_ico "gfx/vehicles/waki.tga" -#define waki_eng "gfx/vehicles/waki_e.tga" -#define waki_gun "gfx/vehicles/waki_guns.tga" -#define waki_rkt "gfx/vehicles/waki_rockets.tga" -#define waki_xhair "gfx/vehicles/axh-special1.tga" void CSQC_WAKIZASHI_HUD() { /* @@ -525,7 +669,7 @@ void CSQC_WAKIZASHI_HUD() // Fetch health & ammo stats HUD_GETSTATS - picsize = drawgetimagesize(hud_bg) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_bg) * autocvar_cl_vehicles_hudscale; hudloc_y = vid_conheight - picsize_y; hudloc_x = vid_conwidth * 0.5 - picsize_x * 0.5; @@ -536,7 +680,7 @@ void CSQC_WAKIZASHI_HUD() energy *= 0.01; reload1 *= 0.01; - pic2size = drawgetimagesize(spider_ico) * (autocvar_cl_vehicles_hudscale * 0.8); + pic2size = draw_getimagesize(spider_ico) * (autocvar_cl_vehicles_hudscale * 0.8); picloc = picsize * 0.5 - pic2size * 0.5; if(vh_health < 0.25) drawpic(hudloc + picloc, waki_ico, pic2size, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); @@ -548,13 +692,13 @@ void CSQC_WAKIZASHI_HUD() drawpic(hudloc + picloc, hud_sh, pic2size, '1 1 1', shield, DRAWFLAG_NORMAL); // Health bar - picsize = drawgetimagesize(hud_hp_bar) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_hp_bar) * autocvar_cl_vehicles_hudscale; picloc = '69 69 0' * autocvar_cl_vehicles_hudscale; drawsetcliparea(hudloc_x + picloc_x + (picsize_x * (1 - vh_health)), 0, vid_conwidth, vid_conheight); drawpic(hudloc + picloc, hud_hp_bar, picsize, '1 1 1', 1 , DRAWFLAG_NORMAL); drawresetcliparea(); // .. and icon - picsize = drawgetimagesize(hud_hp_ico) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_hp_ico) * autocvar_cl_vehicles_hudscale; picloc = '37 65 0' * autocvar_cl_vehicles_hudscale; if(vh_health < 0.25) { @@ -578,20 +722,20 @@ void CSQC_WAKIZASHI_HUD() // Shield bar - picsize = drawgetimagesize(hud_sh_bar) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_sh_bar) * autocvar_cl_vehicles_hudscale; picloc = '69 140 0' * autocvar_cl_vehicles_hudscale; drawsetcliparea(hudloc_x + picloc_x + (picsize_x * (1 - shield)), 0, vid_conwidth, vid_conheight); drawpic(hudloc + picloc, hud_sh_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); drawresetcliparea(); // .. and icon picloc = '40 136 0' * autocvar_cl_vehicles_hudscale; - picsize = drawgetimagesize(hud_sh_ico) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_sh_ico) * autocvar_cl_vehicles_hudscale; if(shield < 0.25) { if(alarm2time < time) { alarm2time = time + 1; - sound(world, CH_TRIGGER_SINGLE, "vehicles/alarm_shield.wav", VOL_BASEVOICE, ATTN_NONE); + sound(self, CH_TRIGGER_SINGLE, "vehicles/alarm_shield.wav", VOL_BASEVOICE, ATTN_NONE); } drawpic(hudloc + picloc, hud_sh_ico, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); } @@ -600,19 +744,19 @@ void CSQC_WAKIZASHI_HUD() drawpic(hudloc + picloc, hud_sh_ico, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); if(alarm2time) { - sound(world, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_BASEVOICE, ATTN_NONE); + sound(self, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_BASEVOICE, ATTN_NONE); alarm2time = 0; } } // Gun bar - picsize = drawgetimagesize(hud_ammo1_bar) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_ammo1_bar) * autocvar_cl_vehicles_hudscale; picloc = '450 69 0' * autocvar_cl_vehicles_hudscale; drawsetcliparea(hudloc_x + picloc_x, picloc_y, picsize_x * energy, vid_conheight); drawpic(hudloc + picloc, hud_ammo1_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); drawresetcliparea(); // .. and icon - picsize = drawgetimagesize(hud_ammo1_ico) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_ammo1_ico) * autocvar_cl_vehicles_hudscale; picloc = '664 60 0' * autocvar_cl_vehicles_hudscale; if(energy < 0.2) drawpic(hudloc + picloc, hud_ammo1_ico, picsize, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); @@ -620,13 +764,13 @@ void CSQC_WAKIZASHI_HUD() drawpic(hudloc + picloc, hud_ammo1_ico, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); // Bomb bar - picsize = drawgetimagesize(hud_ammo2_bar) * autocvar_cl_vehicles_hudscale; + picsize = draw_getimagesize(hud_ammo2_bar) * autocvar_cl_vehicles_hudscale; picloc = '450 140 0' * autocvar_cl_vehicles_hudscale; drawsetcliparea(hudloc_x + picloc_x, hudloc_y + picloc_y, picsize_x * reload1, vid_conheight); drawpic(hudloc + picloc, hud_ammo2_bar, picsize, '1 1 1', 1, DRAWFLAG_NORMAL); drawresetcliparea(); // .. and icon - pic2size = drawgetimagesize(hud_ammo2_ico) * autocvar_cl_vehicles_hudscale; + pic2size = draw_getimagesize(hud_ammo2_ico) * autocvar_cl_vehicles_hudscale; picloc = '664 130 0' * autocvar_cl_vehicles_hudscale; if(reload1 != 1) drawpic(hudloc + picloc, hud_ammo2_ico, pic2size, '1 0 0' + '0 1 1' * sin(time * 8), 1, DRAWFLAG_NORMAL); @@ -637,7 +781,7 @@ void CSQC_WAKIZASHI_HUD() HUD_DrawScoreboard(); else { - picsize = drawgetimagesize(waki_xhair); + picsize = draw_getimagesize(waki_xhair); picsize_x *= 0.5; picsize_y *= 0.5; @@ -649,11 +793,13 @@ void CSQC_WAKIZASHI_HUD() void Vehicles_Precache() { // fixme: HAAAAKKKZZZ!!!!!!!!!!!! (this belongs as a setting in default.cfg) - autocvar_cl_vehicles_hudscale = 0.5; - autocvar_cl_vehicles_hudalpha = 0.75; - + if(!autocvar_cl_vehicles_hudscale ) + autocvar_cl_vehicles_hudscale = 0.5; + + if(!autocvar_cl_vehicles_hudalpha) + autocvar_cl_vehicles_hudalpha = 0.75; - precache_model("models/vehicles/wakizashi.dpm"); + //precache_model("models/vehicles/wakizashi.dpm"); precache_model("models/vehicles/bomblet.md3"); precache_model("models/vehicles/clusterbomb.md3");