edg-l
/
ddnet
mirror of https://github.com/ddnet/ddnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Display 0.7 skins in chat

This commit is contained in:
ChillerDragon 2024-04-25 09:04:58 +08:00
parent b9442f895d
commit 1905cb9e5b
2 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/game/client/components/chat.cpp
View File

@ -9,6 +9,7 @@
#include <engine/textrender.h>
#include <game/generated/protocol.h>
#include <game/generated/protocol7.h>
#include <game/client/animstate.h>
#include <game/client/components/scoreboard.h>
@ -851,6 +852,46 @@ void CChat::AddLine(int ClientId, int Team, const char *pLine)
pCurrentLine->m_RenderSkinMetrics = LineAuthor.m_RenderInfo.m_SkinMetrics;
pCurrentLine->m_HasRenderTee = true;
// 0.7
if(Client()->IsSixup())
{
for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
{
const char *pPartName = LineAuthor.m_Sixup.m_aaSkinPartNames[Part];
pCurrentLine->m_Sixup.m_aUseCustomColors[Part] = LineAuthor.m_Sixup.m_aUseCustomColors[Part];
pCurrentLine->m_Sixup.m_aSkinPartColors[Part] = LineAuthor.m_Sixup.m_aSkinPartColors[Part];
str_utf8_copy_num(
pCurrentLine->m_Sixup.m_aaSkinPartNames[Part],
pPartName,
sizeof(pCurrentLine->m_Sixup.m_aaSkinPartNames[Part]),
MAX_SKIN_LENGTH);
int Id = m_pClient->m_Skins7.FindSkinPart(Part, pPartName, false);
const CSkins7::CSkinPart *pSkinPart = m_pClient->m_Skins7.GetSkinPart(Part, Id);
if(pCurrentLine->m_Sixup.m_aUseCustomColors[Part])
{
pCurrentLine->m_Sixup.m_aTextures[Part] = pSkinPart->m_ColorTexture;
pCurrentLine->m_Sixup.m_aColors[Part] = m_pClient->m_Skins7.GetColorV4(
pCurrentLine->m_Sixup.m_aSkinPartColors[Part],
Part == protocol7::SKINPART_MARKING);
}
else
{
pCurrentLine->m_Sixup.m_aTextures[Part] = pSkinPart->m_OrgTexture;
pCurrentLine->m_Sixup.m_aColors[Part] = vec4(1.0f, 1.0f, 1.0f, 1.0f);
}
if(LineAuthor.m_SkinInfo.m_Sixup.m_HatTexture.IsValid())
{
if(Part == protocol7::SKINPART_BODY && str_comp(pPartName, "standard"))
pCurrentLine->m_Sixup.m_HatSpriteIndex = CSkins7::HAT_OFFSET_SIDE + (ClientId % CSkins7::HAT_NUM);
if(Part == protocol7::SKINPART_DECORATION && str_comp(pPartName, "twinbopp"))
pCurrentLine->m_Sixup.m_HatSpriteIndex = CSkins7::HAT_OFFSET_SIDE + (ClientId % CSkins7::HAT_NUM);
pCurrentLine->m_Sixup.m_HatTexture = LineAuthor.m_SkinInfo.m_Sixup.m_HatTexture;
}
}
}
}
}
}
@ -1306,6 +1347,14 @@ void CChat::OnRender()
RenderInfo.m_ColorFeet = Line.m_ColorFeet;
RenderInfo.m_Size = TeeSize;
for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
{
RenderInfo.m_Sixup.m_aColors[Part] = Line.m_Sixup.m_aColors[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_HatTexture = Line.m_Sixup.m_HatTexture;
}
float RowHeight = FontSize() + RealMsgPaddingY;
float OffsetTeeY = TeeSize / 2.0f;
float FullHeightMinusTee = RowHeight - TeeSize;

19
src/game/client/components/chat.h
View File

@ -12,6 +12,7 @@
#include <game/client/component.h>
#include <game/client/lineinput.h>
#include <game/client/skin.h>
#include <game/generated/protocol7.h>
class CChat : public CComponent
{
@ -54,6 +55,24 @@ class CChat : public CComponent
float m_TextYOffset;
int m_TimesRepeated;
class CSixup
{
public:
char m_aaSkinPartNames[protocol7::NUM_SKINPARTS][MAX_SKIN_LENGTH];
int m_aUseCustomColors[protocol7::NUM_SKINPARTS];
int m_aSkinPartColors[protocol7::NUM_SKINPARTS];
IGraphics::CTextureHandle m_aTextures[protocol7::NUM_SKINPARTS];
IGraphics::CTextureHandle m_HatTexture;
IGraphics::CTextureHandle m_BotTexture;
int m_HatSpriteIndex;
ColorRGBA m_BotColor;
ColorRGBA m_aColors[protocol7::NUM_SKINPARTS];
};
// 0.7 Skin
CSixup m_Sixup;
};
bool m_PrevScoreBoardShowed;