# HG changeset patch
# User Adam Kaminski <kaminskiadam9@gmail.com>
# Date 1626027508 14400
#      Sun Jul 11 14:18:28 2021 -0400
# Node ID e9a3b5c5c60a8efbf2a97951cefef2db6390981e
# Parent  153023bbd56d8e88468f21585fac4f3544b0868f
Removed the DONTUSECOOPINFO and DONTUSESCOREBOARD game mode flags.

diff -r 153023bbd56d -r e9a3b5c5c60a src/g_shared/st_hud.cpp
--- a/src/g_shared/st_hud.cpp	Mon Jul 05 17:43:49 2021 -0400
+++ b/src/g_shared/st_hud.cpp	Sun Jul 11 14:18:28 2021 -0400
@@ -329,8 +329,7 @@
 void HUD_DrawCoopInfo( void )
 {
 	// [BB] Only draw the info if the user wishes to see it (cl_drawcoopinfo)
-	// [AK] Don't draw the info either if this game mode has the DONTUSECOOPINFO flag.
-	if (( cl_drawcoopinfo == false ) || ( zadmflags & ZADF_NO_COOP_INFO ) || ( GAMEMODE_GetCurrentFlags() & GMF_DONTUSECOOPINFO ))
+	if (( cl_drawcoopinfo == false ) || ( zadmflags & ZADF_NO_COOP_INFO ))
 		return;
 
 	// [BB] Only draw the info if this is a cooperative or team based game mode. Further don't draw this in single player.
diff -r 153023bbd56d -r e9a3b5c5c60a src/gamemode_enums.h
--- a/src/gamemode_enums.h	Mon Jul 05 17:43:49 2021 -0400
+++ b/src/gamemode_enums.h	Sun Jul 11 14:18:28 2021 -0400
@@ -73,8 +73,6 @@
 	ENUM_ELEMENT2 ( GMF_USEMAXLIVES,		0x00001000 ),
 	ENUM_ELEMENT2 ( GMF_USETEAMITEM,		0x00002000 ),
 	ENUM_ELEMENT2 ( GMF_MAPRESET_RESETS_MAPTIME,		0x00004000 ),
-	ENUM_ELEMENT2 ( GMF_DONTUSECOOPINFO,	0x00008000 ),
-	ENUM_ELEMENT2 ( GMF_DONTUSESCOREBOARD,	0x00010000 ),
 }
 END_ENUM( GMF )
 
diff -r 153023bbd56d -r e9a3b5c5c60a src/scoreboard.cpp
--- a/src/scoreboard.cpp	Mon Jul 05 17:43:49 2021 -0400
+++ b/src/scoreboard.cpp	Sun Jul 11 14:18:28 2021 -0400
@@ -150,9 +150,8 @@
 //
 bool SCOREBOARD_ShouldDrawBoard( ULONG ulDisplayPlayer )
 {
-	// [AK] If the user isn't pressing their scoreboard key or if the current game mode
-	// doesn't use the scoreboard then return false.
-	if (( Button_ShowScores.bDown == false ) || ( GAMEMODE_GetCurrentFlags( ) & GMF_DONTUSESCOREBOARD ))
+	// [AK] If the user isn't pressing their scoreboard key then return false.
+	if ( Button_ShowScores.bDown == false )
 		return false;
 
 	// [AK] We generally don't want to draw the scoreboard in singleplayer games unless we're