From 0ac4be76988ff79066c3e39ae3dfe24de928e1ac Mon Sep 17 00:00:00 2001
From: nullsystem <15316579+nullsystem@users.noreply.github.com>
Date: Mon, 3 Aug 2026 21:31:01 +0100
Subject: [PATCH] NeoUI Scoreboard - Extra gamemode check for readyup

Non-competitve gamemodes does not deal with readyup
---
 src/game/client/neo/ui/neo_scoreboard.cpp |  4 +++-
 src/game/shared/neo/neo_gamerules.cpp     |  9 ---------
 src/game/shared/neo/neo_gamerules.h       | 10 +++++++++-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/game/client/neo/ui/neo_scoreboard.cpp b/src/game/client/neo/ui/neo_scoreboard.cpp
index 4946f5147..d1175f215 100644
--- a/src/game/client/neo/ui/neo_scoreboard.cpp
+++ b/src/game/client/neo/ui/neo_scoreboard.cpp
@@ -583,8 +583,10 @@ void CNEOScoreBoard::OnMainLoop(const NeoUI::Mode eMode)
 	const int iAvatarOffset = m_uiCtx.iMarginX;
 	const int iAvatarWT = ShowAvatars() ? (iPopupCardPerRowTallAvatarName - (iAvatarOffset * 2)) : 0;
 	const bool bIsTeamplay = NEORules()->IsTeamplay();
+	const int iGameType = NEORules()->GetGameType();
 	const bool bShowReadyUp = sv_neo_readyup_lobby.GetBool()
-			&& NEORules()->m_nRoundStatus == NeoRoundStatus::Idle;
+			&& NEORules()->m_nRoundStatus == NeoRoundStatus::Idle
+			&& NEO_GAME_TYPE_SETTINGS[iGameType].comp;
 	const bool bShowDamageInfo = pLocalPlayer->IsPlayerDead()
 			&& NEORules()->InRoundState()
 			&& g_neoKillerInfos.bHasDmgInfos
diff --git a/src/game/shared/neo/neo_gamerules.cpp b/src/game/shared/neo/neo_gamerules.cpp
index b6faeae68..7c22bc578 100644
--- a/src/game/shared/neo/neo_gamerules.cpp
+++ b/src/game/shared/neo/neo_gamerules.cpp
@@ -395,15 +395,6 @@ static NEOViewVectors g_NEOViewVectors(
 	Vector(16, 16, 60)	  //VEC_CROUCH_TRACE_MAX (m_vCrouchTraceMax)
 );
 
-struct NeoGameTypeSettings {
-	const char* gameTypeName;
-	bool respawns;
-	bool neoRulesThink;
-	bool changeTeamClassLoadoutWhenAlive;
-	bool comp;
-	bool capPrevent;
-};
-
 const NeoGameTypeSettings NEO_GAME_TYPE_SETTINGS[NEO_GAME_TYPE__TOTAL] = {
 //						gametypeName	respawns	neoRulesThink	changeTeamClassLoadoutWhenAlive	comp	capPrevent
 /*NEO_GAME_TYPE_TDM*/	{"TDM",			true,		true,			false,							false,	false},
diff --git a/src/game/shared/neo/neo_gamerules.h b/src/game/shared/neo/neo_gamerules.h
index 7d3045be3..9c473156f 100644
--- a/src/game/shared/neo/neo_gamerules.h
+++ b/src/game/shared/neo/neo_gamerules.h
@@ -112,8 +112,16 @@ enum NeoGameType {
 	NEO_GAME_TYPE__TOTAL // Number of game types
 };
 
-struct NeoGameTypeSettings;
+struct NeoGameTypeSettings {
+	const char* gameTypeName;
+	bool respawns;
+	bool neoRulesThink;
+	bool changeTeamClassLoadoutWhenAlive;
+	bool comp;
+	bool capPrevent;
+};
 
+extern const NeoGameTypeSettings NEO_GAME_TYPE_SETTINGS[NEO_GAME_TYPE__TOTAL];
 extern const SZWSZTexts NEO_GAME_TYPE_DESC_STRS[NEO_GAME_TYPE__TOTAL];
 
 enum NeoRoundStatus {