From 082376ed9e82e578d78678c47d6be21826fa767e Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Fri, 2 Jun 2017 21:52:05 -0500 Subject: [PATCH] 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 cb914c95..e3122e8c 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 d78fad72..822c2576 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 34935fe1..ae4c6081 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;