edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #3663

Browse source 
3663: Fix chat repeated messages r=def- a=Jupeyy

Pressing "U" to show all chat messages and make a message to appear repeating while holding U, makes it to create 2 instances, bcs another Line is allocated, when not returning for the log.

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Jupeyy <jupjopjap@gmail.com>
This commit is contained in:
bors[bot] 2021-03-01 19:05:30 +00:00 committed by GitHub
parent 020d8c8913 7e00407659
commit b2d4fd5908
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -667,7 +667,17 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine)
if(*p == 0)
return;
bool IgnoreLine = false;
auto &&FChatMsgCheckAndPrint = [=](CLine *pLine) {
if(pLine->m_ClientID < 0) // server or client message
{
if(Client()->State() != IClient::STATE_DEMOPLAYBACK)
StoreSave(pLine->m_aText);
}
char aBuf[1024];
str_format(aBuf, sizeof(aBuf), "%s%s%s", pLine->m_aName, pLine->m_ClientID >= 0 ? ": " : "", pLine->m_aText);
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, pLine->m_Team >= 2 ? "whisper" : (pLine->m_Team ? "teamchat" : "chat"), aBuf, pLine->m_Highlighted);
};
while(*p)
{
@ -699,11 +709,9 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine)
pCurrentLine->m_Time = time();
pCurrentLine->m_YOffset[0] = -1.f;
pCurrentLine->m_YOffset[1] = -1.f;
// Can't return here because we still want to log the message to console,
// even if we ignore it in chat. We will set the new line, fill it out
// totally, but then in the end revert back m_CurrentLine after writing
// the message to console.
IgnoreLine = true;
FChatMsgCheckAndPrint(pCurrentLine);
return;
}
m_CurrentLine = (m_CurrentLine + 1) % MAX_LINES;
@ -748,13 +756,10 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine)
pCurrentLine->m_Highlighted = Highlighted;
if(ClientID < 0) // server or client message
if(pCurrentLine->m_ClientID < 0) // server or client message
{
str_copy(pCurrentLine->m_aName, "*** ", sizeof(pCurrentLine->m_aName));
str_format(pCurrentLine->m_aText, sizeof(pCurrentLine->m_aText), "%s", pLine);
if(Client()->State() != IClient::STATE_DEMOPLAYBACK)
StoreSave(pCurrentLine->m_aText);
}
else
{
@ -815,15 +820,7 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine)
}
}
char aBuf[1024];
str_format(aBuf, sizeof(aBuf), "%s%s%s", pCurrentLine->m_aName, ClientID >= 0 ? ": " : "", pCurrentLine->m_aText);
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, Team >= 2 ? "whisper" : (pCurrentLine->m_Team ? "teamchat" : "chat"), aBuf, Highlighted);
}
if(IgnoreLine)
{
m_CurrentLine = (m_CurrentLine + MAX_LINES - 1) % MAX_LINES;
return;
FChatMsgCheckAndPrint(pCurrentLine);
}
// play sound