edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dynamically size scoreboard title

Browse source
This commit is contained in:
def 2020-12-31 10:03:15 +01:00
parent 71a371a4ee
commit 992683c772
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -197,13 +197,16 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch
// render title
float TitleFontsize = 40.0f;
int TitleWidth = (lower32 || lower24 || lower16) ? 1140 : 440;
if(!pTitle)
{
if(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags & GAMESTATEFLAG_GAMEOVER)
pTitle = Localize("Game over");
else
{
str_utf8_truncate(aBuf, sizeof(aBuf), Client()->GetCurrentMap(), 16);
str_utf8_copy(aBuf, Client()->GetCurrentMap(), sizeof(aBuf));
while(TextRender()->TextWidth(0, TitleFontsize, aBuf, -1, -1.0f) > TitleWidth)
aBuf[str_length(aBuf) - 1] = '\0';
if(str_comp(aBuf, Client()->GetCurrentMap()))
str_append(aBuf, "…", sizeof(aBuf));
pTitle = aBuf;
@ -614,18 +617,18 @@ void CScoreboard::OnRender()
{
if(m_pClient->m_Snap.m_aTeamSize[0] > 48)
{
RenderScoreboard(Width / 2 - w, 150.0f, w, -4, 0);
RenderScoreboard(Width / 2, 150.0f, w, -5, "");
RenderScoreboard(Width / 2 - w, 150.0f, w, -4, 0);
}
else if(m_pClient->m_Snap.m_aTeamSize[0] > 32)
{
RenderScoreboard(Width / 2 - w, 150.0f, w, -7, 0);
RenderScoreboard(Width / 2, 150.0f, w, -8, "");
RenderScoreboard(Width / 2 - w, 150.0f, w, -7, 0);
}
else if(m_pClient->m_Snap.m_aTeamSize[0] > 16)
{
RenderScoreboard(Width / 2 - w, 150.0f, w, -6, 0);
RenderScoreboard(Width / 2, 150.0f, w, -3, "");
RenderScoreboard(Width / 2 - w, 150.0f, w, -6, 0);
}
else
{

2
src/game/editor/editor.cpp
View file

@ -2975,7 +2975,7 @@ float CEditor::ScaleFontSize(char *pText, int TextSize, float FontSize, int Widt
else
{
pText[str_length(pText) - 4] = '\0';
str_append(pText, "...", TextSize);
str_append(pText, "…", TextSize);
}
}
return FontSize;