r6074 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-07 11:37:34 -0500 (Sat, 07 Mar 2009)
New Revision: 6074

Modified:
   trunk/data/qcsrc/client/View.qc
Log:
fix logic of radar showing


Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2009-03-07 16:18:20 UTC (rev 6073)
+++ trunk/data/qcsrc/client/View.qc	2009-03-07 16:37:34 UTC (rev 6074)
@@ -407,11 +407,22 @@
 	self = e;
 	
 	// draw radar
-	if(teamplay || cvar("cl_teamradar") == 2)
-	{
-		if((cvar_string("cl_teamradar") != "0" && !scoreboard_active) || ons_showmap)
-			teamradar_view();
-	}
+	if(
+		ons_showmap
+		||
+		(
+			!scoreboard_active
+			&&
+			cvar_string("cl_teamradar") != "0"
+			&&
+			(
+				cvar("cl_teamradar") == 2
+				||
+				teamplay
+			)
+		)
+	)
+		teamradar_view();
 
 	if (cvar("cl_showpressedkeys")) // draw pressed keys when spectating and playing
 	{