From d7add9ce76a4d94c2dd9bbe71f44b2d4e6fcdfec Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sun, 6 Jan 2008 11:46:01 +0000
Subject: [PATCH] - Added scoreboard fix by Karate Chris.

SVN r671 (trunk)
---
 docs/rh-log.txt   | 1 +
 src/ct_chat.cpp   | 3 ---
 src/hu_scores.cpp | 7 +++++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 643482bc3..b1ccce1ce 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,5 @@
 January 6, 2008 (Changes by Graf Zahl)
+- Added scoreboard fix by Karate Chris.
 - Added teamgame fix for menu by Karate Chris.
 - Added GZDoom's Sector_Outside sector type which forces outside fog
   regardless of ceiling texture.
diff --git a/src/ct_chat.cpp b/src/ct_chat.cpp
index 335db26b5..2953483d6 100644
--- a/src/ct_chat.cpp
+++ b/src/ct_chat.cpp
@@ -249,9 +249,6 @@ void CT_Drawer (void)
 	}
 
 	if (players[consoleplayer].camera != NULL &&
-		((deathmatch && teamplay && sb_teamdeathmatch_enable) ||
-		(deathmatch && !teamplay && sb_deathmatch_enable) ||
-		(!deathmatch && multiplayer && sb_cooperative_enable)) &&
 		(Button_ShowScores.bDown ||
 		 players[consoleplayer].camera->health <= 0))
 	{
diff --git a/src/hu_scores.cpp b/src/hu_scores.cpp
index 528d86306..70a2d4c1c 100644
--- a/src/hu_scores.cpp
+++ b/src/hu_scores.cpp
@@ -114,7 +114,7 @@ void HU_DrawScores (player_t *player)
 	}
 	else
 	{
-		if (!sb_cooperative_enable)
+		if (!sb_cooperative_enable || !multiplayer)
 			return;
 	}
 
@@ -308,7 +308,10 @@ static void HU_DrawPlayer (player_t *player, bool highlight, int x, int y, int h
 
 	if (teamplay && deathmatch)
 	{
-		color = teams[player->userinfo.team].GetTextColor ();
+		if (TEAMINFO_IsValidTeam (player->userinfo.team))
+			color = teams[player->userinfo.team].GetTextColor ();
+		else
+			color = CR_GREY;
 	}
 	else
 	{