From a7af3e77752583c8c0c0bdc53a00d559c14c3cfb Mon Sep 17 00:00:00 2001 From: FruitieX Date: Sun, 15 Aug 2010 14:59:08 +0300 Subject: [PATCH] woops let the scoreboard fade out the team radar as well --- qcsrc/client/teamradar.qc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc index dbb884168..55b565074 100644 --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@ -106,17 +106,17 @@ void(vector coord3d, vector pangles, vector rgb) draw_teamradar_player = rgb2 = '1 1 1'; R_BeginPolygon("", 0); - R_PolygonVertex(coord+v_forward*3, '0 0 0', rgb2, autocvar_hud_panel_fg_alpha); - R_PolygonVertex(coord+v_right*4-v_forward*2.5, '0 1 0', rgb2, autocvar_hud_panel_fg_alpha); - R_PolygonVertex(coord-v_forward*2, '1 0 0', rgb2, autocvar_hud_panel_fg_alpha); - R_PolygonVertex(coord-v_right*4-v_forward*2.5, '1 1 0', rgb2, autocvar_hud_panel_fg_alpha); + R_PolygonVertex(coord+v_forward*3, '0 0 0', rgb2, panel_fg_alpha); + R_PolygonVertex(coord+v_right*4-v_forward*2.5, '0 1 0', rgb2, panel_fg_alpha); + R_PolygonVertex(coord-v_forward*2, '1 0 0', rgb2, panel_fg_alpha); + R_PolygonVertex(coord-v_right*4-v_forward*2.5, '1 1 0', rgb2, panel_fg_alpha); R_EndPolygon(); R_BeginPolygon("", 0); - R_PolygonVertex(coord+v_forward*2, '0 0 0', rgb, autocvar_hud_panel_fg_alpha); - R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, autocvar_hud_panel_fg_alpha); - R_PolygonVertex(coord-v_forward, '1 0 0', rgb, autocvar_hud_panel_fg_alpha); - R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, autocvar_hud_panel_fg_alpha); + R_PolygonVertex(coord+v_forward*2, '0 0 0', rgb, panel_fg_alpha); + R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, panel_fg_alpha); + R_PolygonVertex(coord-v_forward, '1 0 0', rgb, panel_fg_alpha); + R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, panel_fg_alpha); R_EndPolygon(); }; @@ -161,10 +161,10 @@ void draw_teamradar_link(vector start, vector end, float colors) c1 = colormapPaletteColor((colors & 0xF0) / 0x10, FALSE); R_BeginPolygon("", 0); - R_PolygonVertex(start - norm, '0 0 0', c0, autocvar_hud_panel_fg_alpha); - R_PolygonVertex(start + norm, '0 1 0', c0, autocvar_hud_panel_fg_alpha); - R_PolygonVertex(end + norm, '1 1 0', c1, autocvar_hud_panel_fg_alpha); - R_PolygonVertex(end - norm, '1 0 0', c1, autocvar_hud_panel_fg_alpha); + R_PolygonVertex(start - norm, '0 0 0', c0, panel_fg_alpha); + R_PolygonVertex(start + norm, '0 1 0', c0, panel_fg_alpha); + R_PolygonVertex(end + norm, '1 1 0', c1, panel_fg_alpha); + R_PolygonVertex(end - norm, '1 0 0', c1, panel_fg_alpha); R_EndPolygon(); } @@ -179,14 +179,14 @@ void teamradar_loadcvars() { v_flipped = cvar("v_flipped"); hud_panel_radar_scale = cvar("hud_panel_radar_scale"); - hud_panel_radar_foreground_alpha = cvar("hud_panel_radar_foreground_alpha") * autocvar_hud_panel_fg_alpha; + hud_panel_radar_foreground_alpha = cvar("hud_panel_radar_foreground_alpha") * panel_fg_alpha; hud_panel_radar_rotation = cvar("hud_panel_radar_rotation"); hud_panel_radar_zoommode = cvar("hud_panel_radar_zoommode"); // others default to 0 // match this to defaultXonotic.cfg! if(!hud_panel_radar_scale) hud_panel_radar_scale = 4096; - if(!hud_panel_radar_foreground_alpha) hud_panel_radar_foreground_alpha = 0.8 * autocvar_hud_panel_fg_alpha; + if(!hud_panel_radar_foreground_alpha) hud_panel_radar_foreground_alpha = 0.8 * panel_fg_alpha; if(!hud_panel_radar_size_x) hud_panel_radar_size_x = 128; if(!hud_panel_radar_size_y) hud_panel_radar_size_y = hud_panel_radar_size_x; -- 2.39.2