Skip to content

Option to make the round info and scoreboard HUD not swap team sides #1333

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

Merged
DESTROYGIRL merged 6 commits into from
Sep 13, 2025
Merged

Option to make the round info and scoreboard HUD not swap team sides #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f7da752
initial
DESTROYGIRL Sep 1, 2025
d3e937e
default 1
DESTROYGIRL Sep 3, 2025
fa39cf5
init
AdamTadeusz Sep 11, 2025
f7dcba6
dont swap scoreboard when disabled
DESTROYGIRL Sep 11, 2025
baddb97
and scoreboard
DESTROYGIRL Sep 11, 2025
0e7b9e6
lambda function
DESTROYGIRL Sep 12, 2025
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
15 changes: 10 additions & 5 deletions src/game/client/neo/ui/neo_hud_round_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ DECLARE_NAMED_HUDELEMENT(CNEOHud_RoundState, NRoundState);

NEO_HUD_ELEMENT_DECLARE_FREQ_CVAR(RoundState, 0.1)

ConVar cl_neo_hud_team_swap_sides("cl_neo_hud_team_swap_sides", "1", FCVAR_ARCHIVE, "Make the team of the local player always appear on the left side of the round info and scoreboard", true, 0.0, true, 1.0,
[]([[maybe_unused]] IConVar* var, [[maybe_unused]] const char* pOldValue, [[maybe_unused]] float flOldValue) {
g_pNeoScoreBoard->UpdateTeamColumnsPosition(GetLocalPlayerTeam());
});
ConVar cl_neo_squad_hud_original("cl_neo_squad_hud_original", "1", FCVAR_ARCHIVE, "Use the old squad HUD", true, 0.0, true, 1.0);
ConVar cl_neo_squad_hud_star_scale("cl_neo_squad_hud_star_scale", "0", FCVAR_ARCHIVE, "Scaling to apply from 1080p, 0 disables scaling");
extern ConVar sv_neo_dm_win_xp;
Expand Down Expand Up @@ -294,7 +298,7 @@ void CNEOHud_RoundState::UpdateStateForNeoHudElementDraw()
const int localPlayerTeam = GetLocalPlayerTeam();
if (NEORules()->IsTeamplay())
{
if (localPlayerTeam == TEAM_JINRAI || localPlayerTeam == TEAM_NSF) {
if (cl_neo_hud_team_swap_sides.GetBool() && (localPlayerTeam == TEAM_JINRAI || localPlayerTeam == TEAM_NSF)) {
V_snwprintf(m_wszLeftTeamScore, 3, L"%i", GetGlobalTeam(localPlayerTeam)->GetRoundsWon());
V_snwprintf(m_wszRightTeamScore, 3, L"%i", GetGlobalTeam(NEORules()->GetOpposingTeam(localPlayerTeam))->GetRoundsWon());
}
Expand Down Expand Up @@ -324,7 +328,7 @@ void CNEOHud_RoundState::UpdateStateForNeoHudElementDraw()
}
else if (NEORules()->GetGameType() == NEO_GAME_TYPE_TDM)
{
if (localPlayerTeam == TEAM_JINRAI || localPlayerTeam == TEAM_NSF) {
if (cl_neo_hud_team_swap_sides.GetBool() && (localPlayerTeam == TEAM_JINRAI || localPlayerTeam == TEAM_NSF)) {
V_sprintf_safe(szPlayersAliveANSI, "%i:%i", GetGlobalTeam(localPlayerTeam)->Get_Score(), GetGlobalTeam(NEORules()->GetOpposingTeam(localPlayerTeam))->Get_Score());
}
else {
Expand Down Expand Up @@ -456,8 +460,9 @@ void CNEOHud_RoundState::DrawNeoHudElement()
const int localPlayerIndex = GetLocalPlayerIndex();
const bool localPlayerSpecOrNoTeam = !NEORules()->IsTeamplay() || !(localPlayerTeam == TEAM_JINRAI || localPlayerTeam == TEAM_NSF);

const int leftTeam = localPlayerSpecOrNoTeam ? TEAM_JINRAI : localPlayerTeam;
const int rightTeam = (leftTeam == TEAM_JINRAI) ? TEAM_NSF : TEAM_JINRAI;
bool swapTeamSides = cl_neo_hud_team_swap_sides.GetBool();
const int leftTeam = swapTeamSides ? (localPlayerSpecOrNoTeam ? TEAM_JINRAI : localPlayerTeam) : TEAM_JINRAI;
const int rightTeam = swapTeamSides ? ((leftTeam == TEAM_JINRAI) ? TEAM_NSF : TEAM_JINRAI) : TEAM_NSF;
const auto leftTeamInfo = m_teamLogoColors[leftTeam];
const auto rightTeamInfo = m_teamLogoColors[rightTeam];

Expand Down Expand Up @@ -616,7 +621,7 @@ void CNEOHud_RoundState::DrawPlayerList()
const int localPlayerTeam = GetLocalPlayerTeam();
const int localPlayerIndex = GetLocalPlayerIndex();
const bool localPlayerSpec = !(localPlayerTeam == TEAM_JINRAI || localPlayerTeam == TEAM_NSF);
const int leftTeam = localPlayerSpec ? TEAM_JINRAI : localPlayerTeam;
const int leftTeam = cl_neo_hud_team_swap_sides.GetBool() ? (localPlayerSpec ? TEAM_JINRAI : localPlayerTeam) : TEAM_JINRAI;

if (localPlayerSpec)
{
Expand Down
35 changes: 35 additions & 0 deletions 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 @@ -49,6 +49,7 @@ using namespace vgui;

ConVar neo_show_scoreboard_avatars("neo_show_scoreboard_avatars", "1", FCVAR_ARCHIVE, "Show avatars on scoreboard.", true, 0.0, true, 1.0 );
extern ConVar cl_neo_streamermode;
extern ConVar cl_neo_hud_team_swap_sides;

CNEOScoreBoard* g_pNeoScoreBoard = NULL;

Expand Down Expand Up @@ -235,6 +236,19 @@ void CNEOScoreBoard::PostApplySchemeSettings( vgui::IScheme *pScheme )

// light up scoreboard a bit
SetBgColor( Color( 0,0,0,0) );

// What happens if PostApplySchemeSettings runs the instant the local player's team changes?
if (GetLocalPlayerTeam() == TEAM_NSF)
{
m_pJinraiPlayerList->GetPos(m_iRightTeamXPos, m_iRightTeamYPos);
m_pNSFPlayerList->GetPos(m_iLeftTeamXPos, m_iLeftTeamYPos);
}
else
{
m_pJinraiPlayerList->GetPos(m_iLeftTeamXPos, m_iLeftTeamYPos);
m_pNSFPlayerList->GetPos(m_iRightTeamXPos, m_iRightTeamYPos);
}
UpdateTeamColumnsPosition(GetLocalPlayerTeam());
}

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -330,6 +344,10 @@ void CNEOScoreBoard::FireGameEvent( IGameEvent *event )
if (pPlayer)
{
UpdatePlayerAvatar(pPlayer->index, nullptr);
if (GetLocalPlayerIndex() == pPlayer->entindex())
{
UpdateTeamColumnsPosition(event->GetInt("team"));
}
}
}

Expand Down Expand Up @@ -859,3 +877,20 @@ void CNEOScoreBoard::MoveToCenterOfScreen()
surface()->GetWorkspaceBounds(wx, wy, ww, wt);
SetPos((ww - GetWide()) / 2, (wt - GetTall()) / 2);
}

//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void CNEOScoreBoard::UpdateTeamColumnsPosition(int team)
{
if (team == TEAM_NSF && cl_neo_hud_team_swap_sides.GetBool())
{
m_pJinraiPlayerList->SetPos(m_iRightTeamXPos, m_iRightTeamYPos);
m_pNSFPlayerList->SetPos(m_iLeftTeamXPos, m_iLeftTeamYPos);
}
else
{
m_pJinraiPlayerList->SetPos(m_iLeftTeamXPos, m_iLeftTeamYPos);
m_pNSFPlayerList->SetPos(m_iRightTeamXPos, m_iRightTeamYPos);
}
}
6 changes: 6 additions & 0 deletions src/game/client/neo/ui/neo_scoreboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class CNEOScoreBoard : public vgui::EditablePanel, public IViewPortPanel, public
virtual void FireGameEvent( IGameEvent *event);

virtual void UpdatePlayerAvatar(int playerIndex, KeyValues* kv);
void UpdateTeamColumnsPosition(int team);

vgui::ImageList *m_pImageList;
CUtlMap<CSteamID,int> m_mapAvatarsToImageList;
Expand Down Expand Up @@ -81,6 +82,11 @@ class CNEOScoreBoard : public vgui::EditablePanel, public IViewPortPanel, public
vgui::SectionedListPanel *m_pNSFPlayerList;
vgui::SectionedListPanel *m_pSpectatorsPlayerList;

int m_iLeftTeamXPos = 0;
int m_iLeftTeamYPos = 0;
int m_iRightTeamXPos = 0;
int m_iRightTeamYPos = 0;

int s_VoiceImage[5];
int TrackerImage;
int m_HLTVSpectators;
Expand Down
Loading