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

Merge pull request #672 from Learath2/dd_pr_hearts

Browse source 
Forgot m_Friend isn't initialized, also align the messages
This commit is contained in:
Dennis Felsing 2017-03-13 12:04:47 +01:00 committed by GitHub
parent f488c82bd6 3bd94b9ada
commit 32a1fa0c07
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -545,6 +545,7 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine)
m_aLines[m_CurrentLine].m_Friend = m_pClient->m_aClients[ClientID].m_Friend;
}
m_aLines[m_CurrentLine].m_Friend = ClientID >= 0 ? m_pClient->m_aClients[ClientID].m_Friend : false;
char aBuf[1024];
str_format(aBuf, sizeof(aBuf), "%s%s", m_aLines[m_CurrentLine].m_aName, m_aLines[m_CurrentLine].m_aText);
@ -744,11 +745,19 @@ void CChat::OnRender()
TextRender()->SetCursor(&Cursor, Begin, y, FontSize, TEXTFLAG_RENDER);
Cursor.m_LineWidth = LineWidth;
if(g_Config.m_ClMessageFriend && m_aLines[r].m_Friend)
if(g_Config.m_ClMessageFriend)
{
vec3 rgb = HslToRgb(vec3(g_Config.m_ClMessageFriendHue / 255.0f, g_Config.m_ClMessageFriendSat / 255.0f, g_Config.m_ClMessageFriendLht / 255.0f));
TextRender()->TextColor(rgb.r, rgb.g, rgb.b, Blend);
TextRender()->TextEx(&Cursor, "♥ ", -1);
if(m_aLines[r].m_Friend)
{
vec3 rgb = HslToRgb(vec3(g_Config.m_ClMessageFriendHue / 255.0f, g_Config.m_ClMessageFriendSat / 255.0f, g_Config.m_ClMessageFriendLht / 255.0f));
TextRender()->TextColor(rgb.r, rgb.g, rgb.b, Blend);
TextRender()->TextEx(&Cursor, "♥ ", -1);
}
else // Ugly hack to align messages
{
float tw = TextRender()->TextWidth(0, FontSize, "♥ ", -1);
Cursor.m_X += tw;
}
}
// render name