edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-09 17:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8600 from Robyt3/Scoreboard-Team-Name-Localization

Browse source 
Readd separate localization strings for `Red/blue team wins!`
This commit is contained in:
heinrich5991 2024-07-16 16:01:17 +00:00 committed by GitHub
parent 3c43dcd636 088f963c0d
commit 02aec0db3b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/game/client/components/scoreboard.cpp
View file

@ -583,12 +583,26 @@ void CScoreboard::OnRender()
if(pGameDataObj->m_TeamscoreRed > pGameDataObj->m_TeamscoreBlue)
{
TextRender()->TextColor(ColorRGBA(0.975f, 0.17f, 0.17f, 1.0f));
str_format(aTitle, sizeof(aTitle), Localize("%s wins!"), pRedTeamName);
if(pRedTeamName == nullptr)
{
str_copy(aTitle, Localize("Red team wins!"));
}
else
{
str_format(aTitle, sizeof(aTitle), Localize("%s wins!"), pRedTeamName);
}
}
else if(pGameDataObj->m_TeamscoreBlue > pGameDataObj->m_TeamscoreRed)
{
TextRender()->TextColor(ColorRGBA(0.17f, 0.46f, 0.975f, 1.0f));
str_format(aTitle, sizeof(aTitle), Localize("%s wins!"), pBlueTeamName);
if(pBlueTeamName == nullptr)
{
str_copy(aTitle, Localize("Blue team wins!"));
}
else
{
str_format(aTitle, sizeof(aTitle), Localize("%s wins!"), pBlueTeamName);
}
}
else
{
@ -612,8 +626,8 @@ void CScoreboard::OnRender()
RedScoreboard.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_B, 15.0f);
BlueScoreboard.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.5f), IGraphics::CORNER_B, 15.0f);
RenderTitle(RedTitle, TEAM_RED, pRedTeamName);
RenderTitle(BlueTitle, TEAM_BLUE, pBlueTeamName);
RenderTitle(RedTitle, TEAM_RED, pRedTeamName == nullptr ? Localize("Red team") : pRedTeamName);
RenderTitle(BlueTitle, TEAM_BLUE, pBlueTeamName == nullptr ? Localize("Blue team") : pBlueTeamName);
RenderScoreboard(RedScoreboard, TEAM_RED, 0, NumPlayers);
RenderScoreboard(BlueScoreboard, TEAM_BLUE, 0, NumPlayers);
}
@ -701,7 +715,6 @@ const char *CScoreboard::GetTeamName(int Team) const
int ClanPlayers = 0;
const char *pClanName = nullptr;
const char *pDefaultTeamName = Team == TEAM_RED ? Localize("Red team") : Localize("Blue team");
for(const CNetObj_PlayerInfo *pInfo : GameClient()->m_Snap.m_apInfoByScore)
{
if(!pInfo || pInfo->m_Team != Team)
@ -717,12 +730,12 @@ const char *CScoreboard::GetTeamName(int Team) const
if(str_comp(GameClient()->m_aClients[pInfo->m_ClientId].m_aClan, pClanName) == 0)
ClanPlayers++;
else
return pDefaultTeamName;
return nullptr;
}
}
if(ClanPlayers > 1 && pClanName[0] != '\0')
return pClanName;
else
return pDefaultTeamName;
return nullptr;
}