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

Refactor json parser usage in CServerInfo2::FromJsonRaw

Browse source
This commit is contained in:
Robert Müller 2023-09-18 17:36:24 +02:00
parent ca1bec5bac
commit 2973eee036
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/engine/shared/serverinfo.cpp
View file

@ -142,7 +142,7 @@ bool CServerInfo2::FromJsonRaw(CServerInfo2 *pOut, const json_value *pJson)
if(SkinName.type == json_string) if(SkinName.type == json_string)
{ {
HasSkin = true; HasSkin = true;
str_copy(pClient->m_aSkin, json_string_get(&SkinName)); str_copy(pClient->m_aSkin, SkinName.u.string.ptr);
// if skin json value existed, then always at least default to "default" // if skin json value existed, then always at least default to "default"
if(pClient->m_aSkin[0] == '\0') if(pClient->m_aSkin[0] == '\0')
str_copy(pClient->m_aSkin, "default"); str_copy(pClient->m_aSkin, "default");
@ -150,8 +150,8 @@ bool CServerInfo2::FromJsonRaw(CServerInfo2 *pOut, const json_value *pJson)
if(SkinBodyColor.type == json_integer && SkinFeetColor.type == json_integer) if(SkinBodyColor.type == json_integer && SkinFeetColor.type == json_integer)
{ {
pClient->m_CustomSkinColors = true; pClient->m_CustomSkinColors = true;
pClient->m_CustomSkinColorBody = json_int_get(&SkinBodyColor); pClient->m_CustomSkinColorBody = SkinBodyColor.u.integer;
pClient->m_CustomSkinColorFeet = json_int_get(&SkinFeetColor); pClient->m_CustomSkinColorFeet = SkinFeetColor.u.integer;
} }
// else set custom colors off // else set custom colors off
else else