From dfcab76e257cad2d11c7c44409ab2b07a931e6be Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 3 Oct 2008 06:27:14 +0000 Subject: [PATCH] local player gets black border; hide radar when scoreboard is there git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4591 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/client/View.qc | 5 +++-- data/qcsrc/client/teamradar.qc | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 0b49ea38d..25cde9c5e 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -336,8 +336,9 @@ void CSQC_UpdateView(void) } else if(teamplay) { - if(intermission != 1) - if(intermission != 2) + //if(intermission != 1) + //if(intermission != 2) + if(!scoreboard_active) teamradar_view(); } } diff --git a/data/qcsrc/client/teamradar.qc b/data/qcsrc/client/teamradar.qc index 88a287347..6934a27b0 100644 --- a/data/qcsrc/client/teamradar.qc +++ b/data/qcsrc/client/teamradar.qc @@ -65,16 +65,17 @@ void(vector coord3d, vector pangles, vector rgb) draw_teamradar_player = v_right_x = -v_forward_y; v_right_y = v_forward_x; - if(rgb != '1 1 1') - { + if(rgb == '1 1 1') + rgb2 = '0 0 0'; + else rgb2 = '1 1 1'; - R_BeginPolygon("", 0); - R_PolygonVertex(coord+v_forward*3, '0 0 0', rgb2, 1); - R_PolygonVertex(coord+v_right*4-v_forward*2.5, '0 1 0', rgb2, 1); - R_PolygonVertex(coord-v_forward*2, '1 0 0', rgb2, 1); - R_PolygonVertex(coord-v_right*4-v_forward*2.5, '1 1 0', rgb2, 1); - R_EndPolygon(); - } + + R_BeginPolygon("", 0); + R_PolygonVertex(coord+v_forward*3, '0 0 0', rgb2, 1); + R_PolygonVertex(coord+v_right*4-v_forward*2.5, '0 1 0', rgb2, 1); + R_PolygonVertex(coord-v_forward*2, '1 0 0', rgb2, 1); + R_PolygonVertex(coord-v_right*4-v_forward*2.5, '1 1 0', rgb2, 1); + R_EndPolygon(); R_BeginPolygon("", 0); R_PolygonVertex(coord+v_forward*2, '0 0 0', rgb, 1); -- 2.39.2