r4645 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-06 09:18:46 -0400 (Mon, 06 Oct 2008)
New Revision: 4645

Modified:
   trunk/data/qcsrc/client/View.qc
   trunk/data/qcsrc/client/main.qh
   trunk/data/qcsrc/client/waypointsprites.qc
Log:
also compare the team in SPRITERULE_DEFAULT. Should make it possible to hide a waypoint when changing teams, even if CEFC can't disable it yet (because no other update happens).


Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2008-10-06 10:05:38 UTC (rev 4644)
+++ trunk/data/qcsrc/client/View.qc	2008-10-06 13:18:46 UTC (rev 4645)
@@ -273,8 +273,7 @@
 	R_SetView(VF_DRAWCROSSHAIR, !scoreboard_active);
 	
 	// Draw the Engine Status Bar (the default Quake HUD)
-	draw_enginesbar = !cvar("sbar_usecsqc");
-	R_SetView(VF_DRAWENGINESBAR, draw_enginesbar);
+	R_SetView(VF_DRAWENGINESBAR, 0);
 
 	// Set the console size vars
 	vid_conwidth = cvar("vid_conwidth");
@@ -351,12 +350,9 @@
 	}
 
 	// draw sbar
-	if(!draw_enginesbar)
-	{
-		if(cvar("r_letterbox") == 0)
-		if(cvar("viewsize") < 120)
-			CSQC_common_hud();
-	}
+	if(cvar("r_letterbox") == 0)
+	if(cvar("viewsize") < 120)
+		CSQC_common_hud();
 }
 
 void Sbar_Draw();

Modified: trunk/data/qcsrc/client/main.qh
===================================================================
--- trunk/data/qcsrc/client/main.qh	2008-10-06 10:05:38 UTC (rev 4644)
+++ trunk/data/qcsrc/client/main.qh	2008-10-06 13:18:46 UTC (rev 4645)
@@ -43,7 +43,6 @@
 float gametype;
 entity gps_start;
 
-float draw_enginesbar;
 //float sorted_players;
 //float sorted_teams;
 

Modified: trunk/data/qcsrc/client/waypointsprites.qc
===================================================================
--- trunk/data/qcsrc/client/waypointsprites.qc	2008-10-06 10:05:38 UTC (rev 4644)
+++ trunk/data/qcsrc/client/waypointsprites.qc	2008-10-06 13:18:46 UTC (rev 4645)
@@ -89,7 +89,15 @@
 	switch(self.rule)
 	{
 		case SPRITERULE_DEFAULT:
-			spriteimage = self.netname;
+			if(self.team)
+			{
+				if(self.team == t)
+					spriteimage = self.netname;
+				else
+					spriteimage = "";
+			}
+			else
+				spriteimage = self.netname;
 			break;
 		case SPRITERULE_TEAMPLAY:
 			if(self.team == t)