mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-09 09:38:19 +00:00
Merge pull request #8736 from ChillerDragon/pr_fix_06_chat_skins
Fix old 0.7 skins overwriting 0.6 skins in chat
This commit is contained in:
commit
6a4a70fddd
|
@ -1299,12 +1299,15 @@ void CChat::OnRender()
|
||||||
RenderInfo.m_ColorFeet = Line.m_ColorFeet;
|
RenderInfo.m_ColorFeet = Line.m_ColorFeet;
|
||||||
RenderInfo.m_Size = TeeSize;
|
RenderInfo.m_Size = TeeSize;
|
||||||
|
|
||||||
for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
|
if(Client()->IsSixup())
|
||||||
{
|
{
|
||||||
RenderInfo.m_Sixup.m_aColors[Part] = Line.m_Sixup.m_aColors[Part];
|
for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
|
||||||
RenderInfo.m_Sixup.m_aTextures[Part] = Line.m_Sixup.m_aTextures[Part];
|
{
|
||||||
RenderInfo.m_Sixup.m_HatSpriteIndex = Line.m_Sixup.m_HatSpriteIndex;
|
RenderInfo.m_Sixup.m_aColors[Part] = Line.m_Sixup.m_aColors[Part];
|
||||||
RenderInfo.m_Sixup.m_HatTexture = Line.m_Sixup.m_HatTexture;
|
RenderInfo.m_Sixup.m_aTextures[Part] = Line.m_Sixup.m_aTextures[Part];
|
||||||
|
RenderInfo.m_Sixup.m_HatSpriteIndex = Line.m_Sixup.m_HatSpriteIndex;
|
||||||
|
RenderInfo.m_Sixup.m_HatTexture = Line.m_Sixup.m_HatTexture;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
float RowHeight = FontSize() + RealMsgPaddingY;
|
float RowHeight = FontSize() + RealMsgPaddingY;
|
||||||
|
|
Loading…
Reference in a new issue