[ioquake3] 89/136: Enable tourney scoreboard in Team Arena

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 082376ed9e82e578d78678c47d6be21826fa767e
Author: Zack Middleton <zack at cloemail.com>
Date:   Fri Jun 2 21:52:05 2017 -0500

    Enable tourney scoreboard in Team Arena
    
    "/team score" draws an oversized scoreboard in Q3. In Team Arena
    it draws nothing. They probably intended to replace it with the
    new .menu UI. But since it didn't happen, go ahead and use the Q3
    tournament scoreboard.
---
 code/cgame/cg_draw.c       | 7 -------
 code/cgame/cg_local.h      | 2 +-
 code/cgame/cg_scoreboard.c | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/code/cgame/cg_draw.c b/code/cgame/cg_draw.c
index cb914c9..e3122e8 100644
--- a/code/cgame/cg_draw.c
+++ b/code/cgame/cg_draw.c
@@ -2610,13 +2610,6 @@ static void CG_Draw2D(stereoFrame_t stereoFrame)
 }
 
 
-static void CG_DrawTourneyScoreboard( void ) {
-#ifdef MISSIONPACK
-#else
-	CG_DrawOldTourneyScoreboard();
-#endif
-}
-
 /*
 =====================
 CG_DrawActive
diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index d78fad7..822c257 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -1440,7 +1440,7 @@ void CG_DrawInformation( void );
 // cg_scoreboard.c
 //
 qboolean CG_DrawOldScoreboard( void );
-void CG_DrawOldTourneyScoreboard( void );
+void CG_DrawTourneyScoreboard( void );
 
 //
 // cg_consolecmds.c
diff --git a/code/cgame/cg_scoreboard.c b/code/cgame/cg_scoreboard.c
index 34935fe..ae4c608 100644
--- a/code/cgame/cg_scoreboard.c
+++ b/code/cgame/cg_scoreboard.c
@@ -449,7 +449,7 @@ CG_DrawTourneyScoreboard
 Draw the oversize scoreboard for tournements
 =================
 */
-void CG_DrawOldTourneyScoreboard( void ) {
+void CG_DrawTourneyScoreboard( void ) {
 	const char		*s;
 	vec4_t			color;
 	int				min, tens, ones;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git