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

Merge pull request #9236 from SollyBunny/echo_colors_persist

Browse source 
Echo colors persist + Better pFrom for chat
This commit is contained in:
Robert Müller 2024-11-13 19:25:05 +00:00 committed by GitHub
parent 1ff5d5b10f ae04851a9a
commit 47c3c80462
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/game/client/components/chat.cpp
View file

@ -707,7 +707,19 @@ void CChat::AddLine(int ClientId, int Team, const char *pLine)
ChatLogColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageColor)); ChatLogColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageColor));
} }
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, pLine_->m_Whisper ? "whisper" : (pLine_->m_Team ? "teamchat" : "chat"), aBuf, ChatLogColor); const char *pFrom;
if(pLine_->m_Whisper)
pFrom = "chat/whisper";
else if(pLine_->m_Team)
pFrom = "chat/team";
else if(pLine_->m_ClientId == SERVER_MSG)
pFrom = "chat/server";
else if(pLine_->m_ClientId == CLIENT_MSG)
pFrom = "chat/client";
else
pFrom = "chat/all";
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, pFrom, aBuf, ChatLogColor);
}; };
CLine *pCurrentLine = &m_aLines[m_CurrentLine]; CLine *pCurrentLine = &m_aLines[m_CurrentLine];
@ -743,6 +755,7 @@ void CChat::AddLine(int ClientId, int Team, const char *pLine)
pCurrentLine->m_NameColor = -2; pCurrentLine->m_NameColor = -2;
pCurrentLine->m_Friend = false; pCurrentLine->m_Friend = false;
pCurrentLine->m_HasRenderTee = false; pCurrentLine->m_HasRenderTee = false;
pCurrentLine->m_CustomColor = std::nullopt;
TextRender()->DeleteTextContainer(pCurrentLine->m_TextContainerIndex); TextRender()->DeleteTextContainer(pCurrentLine->m_TextContainerIndex);
Graphics()->DeleteQuadContainer(pCurrentLine->m_QuadContainerIndex); Graphics()->DeleteQuadContainer(pCurrentLine->m_QuadContainerIndex);
@ -776,6 +789,8 @@ void CChat::AddLine(int ClientId, int Team, const char *pLine)
{ {
str_copy(pCurrentLine->m_aName, "— "); str_copy(pCurrentLine->m_aName, "— ");
str_copy(pCurrentLine->m_aText, pLine); str_copy(pCurrentLine->m_aText, pLine);
// Set custom color
pCurrentLine->m_CustomColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageClientColor));
} }
else else
{ {
@ -1044,7 +1059,9 @@ void CChat::OnPrepareLines(float y)
// render name // render name
ColorRGBA NameColor; ColorRGBA NameColor;
if(Line.m_ClientId == SERVER_MSG) if(Line.m_CustomColor)
NameColor = *Line.m_CustomColor;
else if(Line.m_ClientId == SERVER_MSG)
NameColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageSystemColor)); NameColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageSystemColor));
else if(Line.m_ClientId == CLIENT_MSG) else if(Line.m_ClientId == CLIENT_MSG)
NameColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageClientColor)); NameColor = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageClientColor));
@ -1077,20 +1094,22 @@ void CChat::OnPrepareLines(float y)
TextRender()->CreateOrAppendTextContainer(Line.m_TextContainerIndex, &Cursor, ": "); TextRender()->CreateOrAppendTextContainer(Line.m_TextContainerIndex, &Cursor, ": ");
} }
// render line // Only apply msg color if no custom color is set
ColorRGBA Color; if(!Line.m_CustomColor)
if(Line.m_ClientId == SERVER_MSG) {
Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageSystemColor)); ColorRGBA Color;
else if(Line.m_ClientId == CLIENT_MSG) if(Line.m_ClientId == SERVER_MSG)
Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageClientColor)); Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageSystemColor));
else if(Line.m_Highlighted) else if(Line.m_ClientId == CLIENT_MSG)
Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageHighlightColor)); Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageClientColor));
else if(Line.m_Team) else if(Line.m_Highlighted)
Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageTeamColor)); Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageHighlightColor));
else // regular message else if(Line.m_Team)
Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageColor)); Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageTeamColor));
else // regular message
TextRender()->TextColor(Color); Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClMessageColor));
TextRender()->TextColor(Color);
}
CTextCursor AppendCursor = Cursor; CTextCursor AppendCursor = Cursor;
AppendCursor.m_LongestLineWidth = 0.0f; AppendCursor.m_LongestLineWidth = 0.0f;

1
src/game/client/components/chat.h
View file

@ -41,6 +41,7 @@ class CChat : public CComponent
char m_aText[MAX_LINE_LENGTH]; char m_aText[MAX_LINE_LENGTH];
bool m_Friend; bool m_Friend;
bool m_Highlighted; bool m_Highlighted;
std::optional<ColorRGBA> m_CustomColor;
STextContainerIndex m_TextContainerIndex; STextContainerIndex m_TextContainerIndex;
int m_QuadContainerIndex; int m_QuadContainerIndex;