mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-09 09:38:19 +00:00
Fix client crash due to truncated skin name
This commit is contained in:
parent
653c5d07d4
commit
27f65cdbb0
|
@ -1 +1 @@
|
|||
Subproject commit 4d796ea119b52c8901286e14ab96faf7353a5d59
|
||||
Subproject commit a4fbe0e52338a129bc3ac2e3a1de54de1d175279
|
|
@ -6,7 +6,7 @@ class CTeeInfo
|
|||
public:
|
||||
constexpr static const float ms_DarkestLGT7 = 61 / 255.0f;
|
||||
|
||||
char m_aSkinName[64] = {'\0'};
|
||||
char m_aSkinName[24] = {'\0'};
|
||||
int m_UseCustomColor = 0;
|
||||
int m_ColorBody = 0;
|
||||
int m_ColorFeet = 0;
|
||||
|
|
|
@ -101,13 +101,8 @@ public:
|
|||
int ClientID = Item.m_ID;
|
||||
if(ClientID < MAX_CLIENTS)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
CClientData *pClient = &m_aClients[ClientID];
|
||||
IntsToStr(&pInfo->m_Name0, 4, pClient->m_aName);
|
||||
=======
|
||||
CClientData *pClient = &m_aClients[ClientId];
|
||||
int32_to_str(&pInfo->m_Name0, 4, pClient->m_aName, sizeof(pClient->m_aName));
|
||||
>>>>>>> 1138e763b (Add validation for `StrToInts` and `IntsToStr`, move and rename)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue