From 5f8e2742a6fa35b68ab2ba859366e951043a145e Mon Sep 17 00:00:00 2001 From: Corantin H Date: Tue, 23 Jul 2024 10:10:43 +0200 Subject: [PATCH] Fix team number and team size rendering Fix team number and team size rendering outside of the scoreboard when the team is rendered on both sides Fix team number and team size alignment --- src/game/client/components/scoreboard.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/game/client/components/scoreboard.cpp b/src/game/client/components/scoreboard.cpp index 7c15181c4..034ee70b8 100644 --- a/src/game/client/components/scoreboard.cpp +++ b/src/game/client/components/scoreboard.cpp @@ -323,7 +323,8 @@ void CScoreboard::RenderScoreboard(CUIRect Scoreboard, int Team, int CountStart, char aBuf[64]; int MaxTeamSize = m_pClient->Config()->m_SvMaxTeamSize; - float TeamStartY = 0; + static float s_TeamStartY = 0; + static float s_TeamStartX = 0; for(int i = 0; i < MAX_CLIENTS; i++) { @@ -373,7 +374,8 @@ void CScoreboard::RenderScoreboard(CUIRect Scoreboard, int Team, int CountStart, if(PrevDDTeam != DDTeam) { TeamRectCorners |= IGraphics::CORNER_T; - TeamStartY = Row.y; + s_TeamStartY = Row.y; + s_TeamStartX = Row.x; } if(NextDDTeam != DDTeam) TeamRectCorners |= IGraphics::CORNER_B; @@ -393,7 +395,7 @@ void CScoreboard::RenderScoreboard(CUIRect Scoreboard, int Team, int CountStart, str_format(aBuf, sizeof(aBuf), "%d", DDTeam); else str_format(aBuf, sizeof(aBuf), Localize("%d\n(%d/%d)", "Team and size"), DDTeam, CurrentDDTeamSize, MaxTeamSize); - TextRender()->Text(Row.x, TeamStartY + Row.h / 2.0f - TeamFontSize / 2.0f, TeamFontSize, aBuf); + TextRender()->Text(s_TeamStartX, maximum(s_TeamStartY + Row.h / 2.0f - TeamFontSize, s_TeamStartY + 3.0f /* padding top */), TeamFontSize, aBuf); } else {