Skip to content

NeoUI Scoreboard - Extra gamemode check for readyup (Stack PR 1 of 2) #2046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nullsystem wants to merge 1 commit into from
+12 −11
Open

NeoUI Scoreboard - Extra gamemode check for readyup (Stack PR 1 of 2) #2046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/game/client/neo/ui/neo_scoreboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions src/game/shared/neo/neo_gamerules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
10 changes: 9 additions & 1 deletion src/game/shared/neo/neo_gamerules.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down