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

Merge #3647

Browse source 
3647: Make statboard work with up to 32 players r=def- a=Jupeyy


![screenshot_2021-02-26_12-40-50](https://user-images.githubusercontent.com/6654924/109296061-0efa9a80-7830-11eb-8720-05ff0d27b764.png)

Current behavior is not showing it, so better than nothing.
Since FNG with over 16 players is quite a thing, its nice to have it working

## Checklist

- [x] Tested the change ingame
- [x] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Jupeyy <jupjopjap@gmail.com>
This commit is contained in:
bors[bot] 2021-02-26 12:34:47 +00:00 committed by GitHub
parent 3d86c76e5f 33b75bde9a
commit c3ac693f62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/game/client/components/statboard.cpp
View file

@ -156,9 +156,9 @@ void CStatboard::RenderGlobalStats()
}
}
// Dirty hack. Do not show scoreboard if there are more than 16 players
// remove as soon as support of more than 16 players is required
if(NumPlayers > 16)
// Dirty hack. Do not show scoreboard if there are more than 32 players
// remove as soon as support of more than 32 players is required
if(NumPlayers > 32)
return;
//clear motd if it is active
@ -248,14 +248,20 @@ void CStatboard::RenderGlobalStats()
float FontSize = 24.0f;
float LineHeight = 50.0f;
float TeeSizemod = 0.8f;
float TeeOffset = 0.0f;
float ContentLineOffset = LineHeight * 0.05f;
if(NumPlayers > 14)
if(NumPlayers > 16)
{
FontSize = 20.0f;
LineHeight = 22.0f;
TeeSizemod = 0.34f;
ContentLineOffset = 0;
}
else if(NumPlayers > 14)
{
FontSize = 24.0f;
LineHeight = 40.0f;
TeeSizemod = 0.7f;
TeeOffset = -5.0f;
}
for(int j = 0; j < NumPlayers; j++)
@ -269,13 +275,19 @@ void CStatboard::RenderGlobalStats()
Graphics()->TextureClear();
Graphics()->QuadsBegin();
Graphics()->SetColor(1, 1, 1, 0.25f);
RenderTools()->DrawRoundRect(x, y, StatboardContentWidth - 20, LineHeight * 0.95f, 17.0f);
RenderTools()->DrawRoundRect(x - 10, y + ContentLineOffset / 2, StatboardContentWidth, LineHeight - ContentLineOffset, 0);
Graphics()->QuadsEnd();
}
CTeeRenderInfo Teeinfo = m_pClient->m_aClients[pInfo->m_ClientID].m_RenderInfo;
Teeinfo.m_Size *= TeeSizemod;
RenderTools()->RenderTee(CAnimState::GetIdle(), &Teeinfo, EMOTE_NORMAL, vec2(1, 0), vec2(x + 28, y + 28 + TeeOffset));
CAnimState *pIdleState = CAnimState::GetIdle();
vec2 OffsetToMid;
RenderTools()->GetRenderTeeOffsetToRenderedTee(pIdleState, &Teeinfo, OffsetToMid);
vec2 TeeRenderPos(x + Teeinfo.m_Size / 2, y + LineHeight / 2.0f + OffsetToMid.y);
RenderTools()->RenderTee(pIdleState, &Teeinfo, EMOTE_NORMAL, vec2(1, 0), TeeRenderPos);
char aBuf[128];
CTextCursor Cursor;