From bac1028928187c9fffe9cc86507bb8cc95ce4c5a Mon Sep 17 00:00:00 2001 From: Severin Meyer Date: Thu, 23 Jul 2015 20:05:02 +0200 Subject: [PATCH] Use existing cvars for the vehicle HUD, add new cvars for vehicle ammo bar colors --- _hud_descriptions.cfg | 2 + gfx/vehicles/frame.tga | Bin 786450 -> 786450 bytes hud_luma.cfg | 2 + hud_luminos.cfg | 2 + hud_luminos_minimal.cfg | 2 + hud_luminos_minimal_xhair.cfg | 2 + hud_luminos_old.cfg | 2 + hud_nexuiz.cfg | 2 + qcsrc/client/autocvars.qh | 3 +- qcsrc/client/vehicles/all.qc | 96 +++++++++++++++++++++------------- vehicles.cfg | 1 - 11 files changed, 75 insertions(+), 39 deletions(-) diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg index a47884ef0..8bbe38942 100644 --- a/_hud_descriptions.cfg +++ b/_hud_descriptions.cfg @@ -25,6 +25,8 @@ seta hud_progressbar_nexball_color "" "R G B vector of the progress bar backgrou seta hud_progressbar_speed_color "" "R G B vector of the progress bar background color" seta hud_progressbar_acceleration_color "" "R G B vector of the progress bar background color" seta hud_progressbar_acceleration_neg_color "" "R G B vector of the progress bar background color" +seta hud_progressbar_vehicles_ammo1_color "" "R G B vector of the progress bar background color" +seta hud_progressbar_vehicles_ammo2_color "" "R G B vector of the progress bar background color" seta _hud_panelorder "" "contains order in which panels are to be drawn" diff --git a/gfx/vehicles/frame.tga b/gfx/vehicles/frame.tga index 882bd5cbcf08d219a43d27f332492fcb9f234a79..769c061aed3b6e7f680e3335700f6d0553b59100 100644 GIT binary patch literal 786450 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 EKZ(N-XaE2J literal 786450 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 Czs`>U diff --git a/hud_luma.cfg b/hud_luma.cfg index 4f801509e..36af8de67 100644 --- a/hud_luma.cfg +++ b/hud_luma.cfg @@ -23,6 +23,8 @@ seta hud_progressbar_nexball_color "0.2 0.65 0.93" seta hud_progressbar_speed_color "0.77 0.67 0" seta hud_progressbar_acceleration_color "0.2 0.65 0.93" seta hud_progressbar_acceleration_neg_color "0.86 0.35 0" +seta hud_progressbar_vehicles_ammo1_color "0.77 0.67 0" +seta hud_progressbar_vehicles_ammo2_color "0.86 0.35 0" seta _hud_panelorder "15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 " diff --git a/hud_luminos.cfg b/hud_luminos.cfg index 34db2beb6..054254c06 100644 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@ -23,6 +23,8 @@ seta hud_progressbar_nexball_color "0.7 0.1 0" seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" +seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" +seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" seta _hud_panelorder "15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 " diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg index 39a6fd2ed..192ef68d9 100644 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@ -23,6 +23,8 @@ seta hud_progressbar_nexball_color "0.7 0.1 0" seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" +seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" +seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" seta _hud_panelorder "10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 15 16 " diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg index 4b6b7e4a7..4045cc44d 100644 --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@ -23,6 +23,8 @@ seta hud_progressbar_nexball_color "0.7 0.1 0" seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" +seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" +seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" seta _hud_panelorder "15 3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 16 " diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg index 20650899e..4ec02c1b1 100644 --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@ -23,6 +23,8 @@ seta hud_progressbar_nexball_color "0.7 0.1 0" seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" +seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" +seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" seta _hud_panelorder "15 10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 16 " diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg index 2d86881f5..6728107fb 100644 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@ -23,6 +23,8 @@ seta hud_progressbar_nexball_color "0.7 0.1 0" seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" +seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" +seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" seta _hud_panelorder "15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 16 " diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index 065ddc475..0cd212f32 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -78,7 +78,6 @@ float autocvar_cl_spawnzoom_speed = 1; float autocvar_cl_spawnzoom_factor = 2; bool autocvar_cl_stripcolorcodes; bool autocvar_cl_vehicles_hud_tactical = 1; -float autocvar_cl_vehicles_hudalpha = 0.75; float autocvar_cl_vehicles_hudscale = 0.5; float autocvar_cl_vehicles_crosshair_size = 0.5; bool autocvar_cl_velocityzoom_enabled; @@ -372,6 +371,8 @@ vector autocvar_hud_progressbar_shield_color; vector autocvar_hud_progressbar_speed_color; vector autocvar_hud_progressbar_strength_color; vector autocvar_hud_progressbar_superweapons_color; +vector autocvar_hud_progressbar_vehicles_ammo1_color; +vector autocvar_hud_progressbar_vehicles_ammo2_color; bool autocvar_hud_showbinds; bool autocvar_hud_showbinds_limit; bool autocvar__hud_showbinds_reload; diff --git a/qcsrc/client/vehicles/all.qc b/qcsrc/client/vehicles/all.qc index 255b2ff58..d1943ea08 100644 --- a/qcsrc/client/vehicles/all.qc +++ b/qcsrc/client/vehicles/all.qc @@ -89,7 +89,7 @@ void AuxiliaryXhair_Draw2D() { pos.z = 0; size.z = 0; - drawpic(pos, self.axh_image, size, self.colormod, self.alpha, self.axh_drawflag); + drawpic(pos, self.axh_image, size, self.colormod, autocvar_crosshair_alpha * self.alpha, self.axh_drawflag); } if(time - self.cnt > self.axh_fadetime) @@ -197,7 +197,9 @@ void Vehicles_drawHUD( string modelWeapon1, string modelWeapon2, string iconAmmo1, + vector colorAmmo1, string iconAmmo2, + vector colorAmmo2, string crosshair, bool shouldDrawBumbleGunnerCrosshair, bool shouldDrawRaptorBombCrosshair) @@ -214,6 +216,8 @@ void Vehicles_drawHUD( vector tmpSize = '0 0 0'; vector tmpPos = '0 0 0'; + float hudAlpha = autocvar_hud_panel_fg_alpha; + float barAlpha = autocvar_hud_progressbar_alpha * hudAlpha; float blinkValue = 0.55 + sin(time * 7) * 0.45; float health = getstati(STAT_VEHICLESTAT_HEALTH) * 0.01; @@ -232,7 +236,10 @@ void Vehicles_drawHUD( hudPos.x = (vid_conwidth - hudSize.x) / 2; hudPos.y = vid_conheight - hudSize.y; - drawpic(hudPos, vFRAME, hudSize, '1 1 1', autocvar_cl_vehicles_hudalpha, DRAWFLAG_NORMAL); + 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); + else + drawpic(hudPos, vFRAME, hudSize, autocvar_hud_panel_bg_color, autocvar_hud_panel_bg_alpha, DRAWFLAG_NORMAL); // Model tmpSize.x = hudSize.x / 3; @@ -241,13 +248,13 @@ void Vehicles_drawHUD( tmpPos.y = hudPos.y; if(health < 0.25) - drawpic(tmpPos, modelBase, tmpSize, '1 0 0' + '0 1 1' * blinkValue, 1, DRAWFLAG_NORMAL); + drawpic(tmpPos, modelBase, 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), 1, DRAWFLAG_NORMAL); + drawpic(tmpPos, modelBase, 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), 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 + '1 0 0' * (1 - shield), shield, 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); // Health bar tmpSize.y = hudSize.y / 2; @@ -255,13 +262,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, '1 1 1', 1, DRAWFLAG_NORMAL); + drawpic(tmpPos, vBAR_HEALTH, 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, '1 1 1', 1, DRAWFLAG_NORMAL); + drawpic(tmpPos, vBAR_SHIELD, tmpSize, autocvar_hud_progressbar_armor_color, barAlpha, DRAWFLAG_NORMAL); // Ammo1 bar tmpPos.x = hudPos.x + hudSize.x * (480/768); @@ -272,7 +279,7 @@ void Vehicles_drawHUD( else drawsetcliparea(tmpPos.x, tmpPos.y, tmpSize.x * reload1, tmpSize.y); - drawpic(tmpPos, vBAR_AMMO1, tmpSize, '1 1 1', 1, DRAWFLAG_NORMAL); + drawpic(tmpPos, vBAR_AMMO1, tmpSize, colorAmmo1, barAlpha, DRAWFLAG_NORMAL); // Ammo2 bar tmpPos.y = hudPos.y + hudSize.y / 2; @@ -282,7 +289,7 @@ void Vehicles_drawHUD( else drawsetcliparea(tmpPos.x, tmpPos.y, tmpSize.x * reload2, tmpSize.y); - drawpic(tmpPos, vBAR_AMMO2, tmpSize, '1 1 1', 1, DRAWFLAG_NORMAL); + drawpic(tmpPos, vBAR_AMMO2, tmpSize, colorAmmo2, barAlpha, DRAWFLAG_NORMAL); drawresetcliparea(); // Health icon @@ -298,7 +305,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', blinkValue, DRAWFLAG_NORMAL); + drawpic(tmpPos, vICON_HEALTH, tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL); } else { @@ -307,7 +314,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', 1, DRAWFLAG_NORMAL); + drawpic(tmpPos, vICON_HEALTH, tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL); } // Shield icon @@ -320,7 +327,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', blinkValue, DRAWFLAG_NORMAL); + drawpic(tmpPos, vICON_SHIELD, tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL); } else { @@ -329,7 +336,7 @@ 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', 1, DRAWFLAG_NORMAL); + drawpic(tmpPos, vICON_SHIELD, tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL); } // Ammo1 icon @@ -337,24 +344,17 @@ void Vehicles_drawHUD( tmpPos.y = hudPos.y + hudSize.y * (48/256); if(ammo1) - drawpic(tmpPos, iconAmmo1, tmpSize, '1 1 1', 1, DRAWFLAG_NORMAL); + drawpic(tmpPos, iconAmmo1, tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL); else - drawpic(tmpPos, iconAmmo1, tmpSize, '1 1 1', 0.2, DRAWFLAG_NORMAL); + drawpic(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', 1, DRAWFLAG_NORMAL); + drawpic(tmpPos, iconAmmo2, tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL); else - drawpic(tmpPos, iconAmmo2, tmpSize, '1 1 1', 0.2, DRAWFLAG_NORMAL); - - // Crosshair - tmpSize = draw_getimagesize(crosshair) * autocvar_cl_vehicles_crosshair_size; - tmpPos.x = (vid_conwidth - tmpSize.x) / 2; - tmpPos.y = (vid_conheight - tmpSize.y) / 2; - - drawpic(tmpPos, crosshair, tmpSize, '1 1 1', 1, DRAWFLAG_NORMAL); + drawpic(tmpPos, iconAmmo2, tmpSize, '1 1 1', hudAlpha * 0.2, DRAWFLAG_NORMAL); // Bumblebee gunner crosshairs if(shouldDrawBumbleGunnerCrosshair) @@ -365,13 +365,13 @@ void Vehicles_drawHUD( if(!AuxiliaryXhairs[1].draw2d) { tmpPos.y = hudPos.y + hudSize.y * (96/256) - tmpSize.y; - drawstring(tmpPos, _("No right gunner!"), tmpSize, '1 1 1', blinkValue, DRAWFLAG_NORMAL); + drawstring(tmpPos, _("No right gunner!"), tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL); } if(!AuxiliaryXhairs[2].draw2d) { tmpPos.y = hudPos.y + hudSize.y * (160/256); - drawstring(tmpPos, _("No left gunner!"), tmpSize, '1 1 1', blinkValue, DRAWFLAG_NORMAL); + drawstring(tmpPos, _("No left gunner!"), tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL); } } @@ -403,8 +403,8 @@ void Vehicles_drawHUD( where.x -= tmpSize.x * 0.5; where.y -= tmpSize.y * 0.5; where.z = 0; - drawpic(where, vCROSS_DROP, tmpSize, '0 1 0', 0.9, DRAWFLAG_ADDITIVE); - drawpic(where, vCROSS_DROP, tmpSize, '0 1 0', 0.6, DRAWFLAG_NORMAL); // Ensure visibility against bright bg + drawpic(where, vCROSS_DROP, tmpSize, '0 1 0', autocvar_crosshair_alpha * 0.9, DRAWFLAG_ADDITIVE); + drawpic(where, vCROSS_DROP, tmpSize, '0 1 0', autocvar_crosshair_alpha * 0.6, DRAWFLAG_NORMAL); // Ensure visibility against bright bg } dropmark.cnt = time + 5; } @@ -420,22 +420,35 @@ void Vehicles_drawHUD( where.x -= tmpSize.x * 0.5; where.y -= tmpSize.y * 0.5; where.z = 0; - drawpic(where, vCROSS_DROP, tmpSize, '1 0 0', 0.9, DRAWFLAG_ADDITIVE); - drawpic(where, vCROSS_DROP, tmpSize, '1 0 0', 0.6, DRAWFLAG_NORMAL); // Ensure visibility against bright bg + drawpic(where, vCROSS_DROP, tmpSize, '1 0 0', autocvar_crosshair_alpha * 0.9, DRAWFLAG_ADDITIVE); + drawpic(where, vCROSS_DROP, tmpSize, '1 0 0', autocvar_crosshair_alpha * 0.6, DRAWFLAG_NORMAL); // Ensure visibility against bright bg } } } } + + // Crosshair + tmpSize = draw_getimagesize(crosshair) * autocvar_cl_vehicles_crosshair_size; + tmpPos.x = (vid_conwidth - tmpSize.x) / 2; + tmpPos.y = (vid_conheight - tmpSize.y) / 2; + + drawpic(tmpPos, crosshair, tmpSize, '1 1 1', autocvar_crosshair_alpha, DRAWFLAG_NORMAL); } void CSQC_BUMBLE_HUD() { - Vehicles_drawHUD(vMODEL_BUMBLE, vMODEL_BUMBLE_WEAPON1, vMODEL_BUMBLE_WEAPON2, vICON_AMMO1, vICON_AMMO1, vCROSS_HEAL, TRUE, FALSE); + 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, + vCROSS_HEAL, TRUE, FALSE); } void CSQC_BUMBLE_GUN_HUD() { - Vehicles_drawHUD(vMODEL_GUNNER, vMODEL_GUNNER_WEAPON1, vNULL, vICON_AMMO1, vNULL, vNULL, TRUE, FALSE); + Vehicles_drawHUD(vMODEL_GUNNER, vMODEL_GUNNER_WEAPON1, vNULL, + vICON_AMMO1, autocvar_hud_progressbar_vehicles_ammo1_color, + vNULL, '0 0 0', + vNULL, TRUE, FALSE); } void CSQC_SPIDER_HUD() @@ -449,7 +462,10 @@ void CSQC_SPIDER_HUD() default: crosshair = vCROSS_TAG; } - Vehicles_drawHUD(vMODEL_SPIDER, vMODEL_SPIDER_WEAPON1, vMODEL_SPIDER_WEAPON2, vICON_AMMO1, vICON_AMMO2, crosshair, FALSE, FALSE); + 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, + crosshair, FALSE, FALSE); } void CSQC_RAPTOR_HUD() @@ -462,12 +478,18 @@ void CSQC_RAPTOR_HUD() default: crosshair = vCROSS_AIM; } - Vehicles_drawHUD(vMODEL_RAPTOR, vMODEL_RAPTOR_WEAPON1, vMODEL_RAPTOR_WEAPON2, vICON_AMMO1, vICON_AMMO2, crosshair, FALSE, TRUE); + 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, + crosshair, FALSE, TRUE); } void CSQC_WAKIZASHI_HUD() { - Vehicles_drawHUD(vMODEL_RACER, vMODEL_RACER_WEAPON1, vMODEL_RACER_WEAPON2, vICON_AMMO1, vICON_AMMO2, vCROSS_AIM, FALSE, FALSE); + 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, + vCROSS_AIM, FALSE, FALSE); } void Vehicles_Precache() diff --git a/vehicles.cfg b/vehicles.cfg index ae252e301..290b12d8c 100644 --- a/vehicles.cfg +++ b/vehicles.cfg @@ -15,7 +15,6 @@ set g_vehicles_crush_force 50 set cl_vehicles_hud_tactical 1 set cl_vehicles_hudscale 0.5 -set cl_vehicles_hudalpha 0.75; set cl_vehicles_crosshair_size 0.5 set g_vehicles_delayspawn 1 -- 2.39.2