r4591 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-03 02:27:14 -0400 (Fri, 03 Oct 2008)
New Revision: 4591

Modified:
   trunk/data/qcsrc/client/View.qc
   trunk/data/qcsrc/client/teamradar.qc
Log:
local player gets black border; hide radar when scoreboard is there


Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2008-10-03 06:01:10 UTC (rev 4590)
+++ trunk/data/qcsrc/client/View.qc	2008-10-03 06:27:14 UTC (rev 4591)
@@ -336,8 +336,9 @@
 	}
 	else if(teamplay)
 	{
-		if(intermission != 1)
-		if(intermission != 2)
+		//if(intermission != 1)
+		//if(intermission != 2)
+		if(!scoreboard_active)
 			teamradar_view();
 	}
 }

Modified: trunk/data/qcsrc/client/teamradar.qc
===================================================================
--- trunk/data/qcsrc/client/teamradar.qc	2008-10-03 06:01:10 UTC (rev 4590)
+++ trunk/data/qcsrc/client/teamradar.qc	2008-10-03 06:27:14 UTC (rev 4591)
@@ -65,18 +65,19 @@
 	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);
 	R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, 1);
 	R_PolygonVertex(coord-v_forward, '1 0 0', rgb, 1);