Skip to content

Fix seeing enemy team in squad HUD, scoreboard becoming misaligned with round info #1353

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 2 commits into from
Sep 19, 2025
Merged

Fix seeing enemy team in squad HUD, scoreboard becoming misaligned with round info #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48e646b
initial
DESTROYGIRL Sep 16, 2025
d3b446f
scoreboard swap fix
DESTROYGIRL Sep 17, 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
2 changes: 1 addition & 1 deletion 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 @@ -625,7 +625,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 = cl_neo_hud_team_swap_sides.GetBool() ? (localPlayerSpec ? TEAM_JINRAI : localPlayerTeam) : TEAM_JINRAI;
const int leftTeam = localPlayerSpec ? TEAM_JINRAI : localPlayerTeam;

if (localPlayerSpec)
{
Expand Down
2 changes: 1 addition & 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 @@ -239,7 +239,7 @@ void CNEOScoreBoard::PostApplySchemeSettings( vgui::IScheme *pScheme )
SetBgColor( Color( 0,0,0,0) );

// What happens if PostApplySchemeSettings runs the instant the local player's team changes?
if (GetLocalPlayerTeam() == TEAM_NSF)
if (GetLocalPlayerTeam() == TEAM_NSF && cl_neo_hud_team_swap_sides.GetBool())
{
m_pJinraiPlayerList->GetPos(m_iRightTeamXPos, m_iRightTeamYPos);
m_pNSFPlayerList->GetPos(m_iLeftTeamXPos, m_iLeftTeamYPos);
Expand Down
Loading