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

fixed an array initialization and removed some magic values. #2016

Browse source
This commit is contained in:
oy 2019-02-04 10:58:00 +01:00
parent 79fe483b83
commit a7ce3b7d9e
1 changed files with 33 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -337,16 +337,19 @@ float CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const c
float FontSize = HeadlineFontsize; float FontSize = HeadlineFontsize;
CTextCursor Cursor; CTextCursor Cursor;
int RenderScoreIDs[16] = { -1 }; const int MAX_IDS = 16;
int RenderScoreIDs[MAX_IDS];
int NumRenderScoreIDs = 0; int NumRenderScoreIDs = 0;
int HoleSizes[2]; int HoleSizes[2];
for(int i = 0; i < MAX_IDS; ++i)
RenderScoreIDs[i] = -1;
// Non vanilla scoreboard, for now, some parts of the scoreboard are omitted // Non vanilla scoreboard, for now, some parts of the scoreboard are omitted
if(NumPlayers > 16) if(NumPlayers > MAX_IDS)
{ {
for(int RenderDead = 0; RenderDead < 2 && NumRenderScoreIDs < 15; ++RenderDead) for(int RenderDead = 0; RenderDead < 2 && NumRenderScoreIDs < MAX_IDS-1; ++RenderDead)
{ {
for(int i = 0; i < MAX_CLIENTS && NumRenderScoreIDs < 15; i++) for(int i = 0; i < MAX_CLIENTS && NumRenderScoreIDs < MAX_IDS-1; i++)
{ {
// make sure that we render the correct team // make sure that we render the correct team
const CGameClient::CPlayerInfoItem *pInfo = &m_pClient->m_Snap.m_aInfoByScore[i]; const CGameClient::CPlayerInfoItem *pInfo = &m_pClient->m_Snap.m_aInfoByScore[i];
@ -358,9 +361,9 @@ float CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const c
NumRenderScoreIDs++; NumRenderScoreIDs++;
} }
} }
NumRenderScoreIDs = 16; NumRenderScoreIDs = MAX_IDS;
RenderScoreIDs[15] = -1; RenderScoreIDs[MAX_IDS-1] = -1;
HoleSizes[0] = m_pClient->m_GameInfo.m_aTeamSize[Team] - 15; HoleSizes[0] = m_pClient->m_GameInfo.m_aTeamSize[Team] - MAX_IDS-1;
if(m_pClient->m_LocalClientID != -1 && (m_pClient->m_aClients[m_pClient->m_LocalClientID].m_Team == Team || m_pClient->m_Snap.m_SpecInfo.m_Active)) if(m_pClient->m_LocalClientID != -1 && (m_pClient->m_aClients[m_pClient->m_LocalClientID].m_Team == Team || m_pClient->m_Snap.m_SpecInfo.m_Active))
{ {
@ -384,40 +387,40 @@ float CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const c
} }
} }
if(Classment < 15) {} if(Classment < MAX_IDS-1) {}
else if(Classment == m_pClient->m_GameInfo.m_aTeamSize[Team] - 1) else if(Classment == m_pClient->m_GameInfo.m_aTeamSize[Team] - 1)
{ {
HoleSizes[0] = Classment - 14; HoleSizes[0] = Classment - MAX_IDS-2;
RenderScoreIDs[13] = -1; RenderScoreIDs[MAX_IDS-3] = -1;
RenderScoreIDs[14] = TeamScoreIDs[Classment-1]; RenderScoreIDs[MAX_IDS-2] = TeamScoreIDs[Classment-1];
RenderScoreIDs[15] = TeamScoreIDs[Classment]; RenderScoreIDs[MAX_IDS-1] = TeamScoreIDs[Classment];
} }
else if(Classment == m_pClient->m_GameInfo.m_aTeamSize[Team] - 2) else if(Classment == m_pClient->m_GameInfo.m_aTeamSize[Team] - 2)
{ {
HoleSizes[0] = Classment - 13; HoleSizes[0] = Classment - MAX_IDS-3;
RenderScoreIDs[12] = -1; RenderScoreIDs[MAX_IDS-4] = -1;
RenderScoreIDs[13] = TeamScoreIDs[Classment-1]; RenderScoreIDs[MAX_IDS-3] = TeamScoreIDs[Classment-1];
RenderScoreIDs[14] = TeamScoreIDs[Classment]; RenderScoreIDs[MAX_IDS-2] = TeamScoreIDs[Classment];
RenderScoreIDs[15] = TeamScoreIDs[Classment+1]; RenderScoreIDs[MAX_IDS-1] = TeamScoreIDs[Classment+1];
} }
else if(Classment == m_pClient->m_GameInfo.m_aTeamSize[Team] - 3) else if(Classment == m_pClient->m_GameInfo.m_aTeamSize[Team] - 3)
{ {
HoleSizes[0] = Classment - 12; HoleSizes[0] = Classment - MAX_IDS-4;
RenderScoreIDs[11] = -1; RenderScoreIDs[MAX_IDS-5] = -1;
RenderScoreIDs[12] = TeamScoreIDs[Classment-1]; RenderScoreIDs[MAX_IDS-4] = TeamScoreIDs[Classment-1];
RenderScoreIDs[13] = TeamScoreIDs[Classment]; RenderScoreIDs[MAX_IDS-3] = TeamScoreIDs[Classment];
RenderScoreIDs[14] = TeamScoreIDs[Classment+1]; RenderScoreIDs[MAX_IDS-2] = TeamScoreIDs[Classment+1];
RenderScoreIDs[15] = TeamScoreIDs[Classment+2]; RenderScoreIDs[MAX_IDS-1] = TeamScoreIDs[Classment+2];
} }
else if(Classment < m_pClient->m_GameInfo.m_aTeamSize[Team] - 3) else if(Classment < m_pClient->m_GameInfo.m_aTeamSize[Team] - 3)
{ {
HoleSizes[0] = Classment - 12; HoleSizes[0] = Classment - MAX_IDS-4;
RenderScoreIDs[11] = -1; RenderScoreIDs[MAX_IDS-5] = -1;
RenderScoreIDs[12] = TeamScoreIDs[Classment-1]; RenderScoreIDs[MAX_IDS-4] = TeamScoreIDs[Classment-1];
RenderScoreIDs[13] = TeamScoreIDs[Classment]; RenderScoreIDs[MAX_IDS-3] = TeamScoreIDs[Classment];
RenderScoreIDs[14] = TeamScoreIDs[Classment+1]; RenderScoreIDs[MAX_IDS-2] = TeamScoreIDs[Classment+1];
HoleSizes[1] = m_pClient->m_GameInfo.m_aTeamSize[Team] - Classment - 2; HoleSizes[1] = m_pClient->m_GameInfo.m_aTeamSize[Team] - Classment - 2;
RenderScoreIDs[15] = -2; RenderScoreIDs[MAX_IDS-1] = -2;
} }
} }
} }
@ -425,7 +428,7 @@ float CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const c
{ {
for(int RenderDead = 0; RenderDead < 2; ++RenderDead) for(int RenderDead = 0; RenderDead < 2; ++RenderDead)
{ {
for(int i = 0; i < MAX_CLIENTS; i++) for(int i = 0; i < MAX_CLIENTS && NumRenderScoreIDs < MAX_IDS; i++)
{ {
// make sure that we render the correct team // make sure that we render the correct team
const CGameClient::CPlayerInfoItem *pInfo = &m_pClient->m_Snap.m_aInfoByScore[i]; const CGameClient::CPlayerInfoItem *pInfo = &m_pClient->m_Snap.m_aInfoByScore[i];