From baff943fb6706a6ae522733bd532af6f721f39dc Mon Sep 17 00:00:00 2001
From: fruitiex <fruitiex@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Wed, 6 Jan 2010 15:55:02 +0000
Subject: [PATCH] hide accuracy stats when observing and fix a typo

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8488 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/client/sbar.qc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index ad4296e9a..bc1dad796 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -129,7 +129,7 @@ void Sbar_DrawWeapon(float nr, float fade, float active, float wc)
 	drawstring(pos, ftos(imp), vsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 
 	// draw the weapon accuracy on the HUD
-	if(sbar_accuracy_hud && !(GAME_RACE || GAME_CTS))
+	if(sbar_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS))
  	{
 		if(weapon_damage)
  			weapon_stats = floor(100 * weapon_hit / weapon_damage);
@@ -1347,7 +1347,7 @@ void Sbar_DrawScoreboard()
 			pos_y += 1.25 * sbar_fontsize_y;
 		}
 	}
-	else if(cvar("sbar_accuracy")) {
+	else if(cvar("sbar_accuracy") && spectatee_status != -1) {
 		if(teamplay)
 			pos = Sbar_DrawScoreboardAccuracyStats(pos, GetTeamRGB(myteam), bg_size);
 		else
@@ -2258,7 +2258,7 @@ void Sbar_DrawAccuracyStats()
 		return;
 	}
 
-	else if(GAME_RACE || GAME_CTS)
+	if(gametype == GAME_RACE || gametype == GAME_CTS)
 	{
 		pos_y += 40;
 		if(mod(time, 1) >= 0.4)
@@ -2647,7 +2647,7 @@ void Sbar_Draw (void)
 	Sbar_UpdatePlayerTeams();
 	if (intermission == 2) // map voting screen
 	{
-		if(sb_showaccuracy) {
+		if(sb_showaccuracy && spectatee_status != -1) {
 			Sbar_DrawAccuracyStats();
 			Sbar_Score();
 			Sbar_Timer();
@@ -2664,7 +2664,7 @@ void Sbar_Draw (void)
 	}
 	else if (sb_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1)
 	{
-  		if(sb_showaccuracy)
+  		if(sb_showaccuracy && spectatee_status != -1)
   			Sbar_DrawAccuracyStats();
   		else
 			Sbar_DrawScoreboard();
@@ -2675,7 +2675,7 @@ void Sbar_Draw (void)
   	}
 	else
 	{
-		if(sb_showaccuracy)
+		if(sb_showaccuracy && spectatee_status != -1)
 			Sbar_DrawAccuracyStats();
 		else
 			Sbar_DrawScoreboard();
-- 
2.39.2