From 756be2755a124454629ae1c3b019a5d7b9a801c6 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Fri, 11 Jan 2008 00:22:52 +0000
Subject: [PATCH] - Applied Karate Chris's TEAMINFO logo patch.

SVN r690 (trunk)
---
 docs/rh-log.txt   | 3 +++
 src/hu_scores.cpp | 8 +++++++-
 src/teaminfo.cpp  | 8 +++++++-
 src/teaminfo.h    | 3 ++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 029048db6..65e36b2a5 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,6 @@
+January 10, 2008
+- Applied Karate Chris's TEAMINFO logo patch.
+
 January 10, 2008 (Changes by Graf Zahl)
 - defined a constant for the crosshair menu entry's index to get a direct
   reference out of the function code. In GZDoom the menu contains different
diff --git a/src/hu_scores.cpp b/src/hu_scores.cpp
index 70a2d4c1c..f9d693de3 100644
--- a/src/hu_scores.cpp
+++ b/src/hu_scores.cpp
@@ -4,7 +4,7 @@
 **
 **---------------------------------------------------------------------------
 ** Copyright 1998-2006 Randy Heit
-** Copyright 2007 Christopher Westley
+** Copyright 2007-2008 Christopher Westley
 ** All rights reserved.
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -329,6 +329,12 @@ static void HU_DrawPlayer (player_t *player, bool highlight, int x, int y, int h
 	screen->DrawText (color, SCREENWIDTH / 2, y, player->userinfo.netname,
 		DTA_CleanNoMove, true, TAG_DONE);
 
+	if (teamplay && teams[player->userinfo.team].logo.GetChars ())
+	{
+		screen->DrawTexture (TexMan[teams[player->userinfo.team].logo.GetChars ()], SCREENWIDTH / 5, y,
+			DTA_CleanNoMove, true, TAG_DONE);
+	}
+
 	if (player->mo->ScoreIcon > 0)
 	{
 		screen->DrawTexture (TexMan[player->mo->ScoreIcon], SCREENWIDTH / 2.25, y,
diff --git a/src/teaminfo.cpp b/src/teaminfo.cpp
index b47dff259..61d02e7bd 100644
--- a/src/teaminfo.cpp
+++ b/src/teaminfo.cpp
@@ -3,7 +3,7 @@
 ** Implementation of the TEAMINFO lump.
 **
 **---------------------------------------------------------------------------
-** Copyright 2007 Christopher Westley
+** Copyright 2007-2008 Christopher Westley
 ** All rights reserved.
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,7 @@ TArray <TEAMINFO> teams;
 static const char *keywords_teaminfo [] = {
 	"PLAYERCOLOR",
 	"TEXTCOLOR",
+	"LOGO",
 	NULL
 };
 
@@ -133,6 +134,11 @@ void TEAMINFO_ParseTeam ()
 			team.textcolor << sc_String << ']';
 			break;
 
+		case 2:
+			SC_MustGetString ();
+			team.logo = sc_String;
+			break;
+
 		default:
 			break;
 		}
diff --git a/src/teaminfo.h b/src/teaminfo.h
index bd169e641..737112f26 100644
--- a/src/teaminfo.h
+++ b/src/teaminfo.h
@@ -3,7 +3,7 @@
 ** Implementation of the TEAMINFO lump.
 **
 **---------------------------------------------------------------------------
-** Copyright 2007 Christopher Westley
+** Copyright 2007-2008 Christopher Westley
 ** All rights reserved.
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,7 @@ struct TEAMINFO
 	int			playercolor;
 	FString		textcolor;
 	int			GetTextColor () const;
+	FString		logo;
 	int			players;
 	int			score;
 	int			present;