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

Merge #4913

Browse source 
4913: Fix whisper sending/receiving differentiation r=def- a=srdante

Fixes #4696 

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [x] 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
- [x] Considered possible null pointers and out of bounds array indexing
- [x] 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: srdante <minidantebtc@gmail.com>
This commit is contained in:
bors[bot] 2022-03-29 21:13:05 +00:00 committed by GitHub
parent 68470cc6b0 ddba1dfdc2
commit a6d6c66b38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -686,9 +686,6 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine)
bool Highlighted = false; bool Highlighted = false;
char *p = const_cast<char *>(pLine); char *p = const_cast<char *>(pLine);
bool IsTeamLine = Team == 1;
bool IsWhisperLine = Team >= 2;
// Only empty string left // Only empty string left
if(*p == 0) if(*p == 0)
return; return;
@ -741,8 +738,11 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine)
CLine *pCurrentLine = &m_aLines[m_CurrentLine]; CLine *pCurrentLine = &m_aLines[m_CurrentLine];
// Team Number:
// 0 = global; 1 = team; 2 = sending whisper; 3 = receiving whisper
// If it's a client message, m_aText will have ": " prepended so we have to work around it. // If it's a client message, m_aText will have ": " prepended so we have to work around it.
if(pCurrentLine->m_Team == IsTeamLine && pCurrentLine->m_Whisper == IsWhisperLine && pCurrentLine->m_ClientID == ClientID && str_comp(pCurrentLine->m_aText, pLine) == 0) if(pCurrentLine->m_TeamNumber == Team && pCurrentLine->m_ClientID == ClientID && str_comp(pCurrentLine->m_aText, pLine) == 0)
{ {
pCurrentLine->m_TimesRepeated++; pCurrentLine->m_TimesRepeated++;
if(pCurrentLine->m_TextContainerIndex != -1) if(pCurrentLine->m_TextContainerIndex != -1)
@ -768,8 +768,9 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine)
pCurrentLine->m_YOffset[0] = -1.0f; pCurrentLine->m_YOffset[0] = -1.0f;
pCurrentLine->m_YOffset[1] = -1.0f; pCurrentLine->m_YOffset[1] = -1.0f;
pCurrentLine->m_ClientID = ClientID; pCurrentLine->m_ClientID = ClientID;
pCurrentLine->m_Team = IsTeamLine; pCurrentLine->m_TeamNumber = Team;
pCurrentLine->m_Whisper = IsWhisperLine; pCurrentLine->m_Team = Team == 1;
pCurrentLine->m_Whisper = Team >= 2;
pCurrentLine->m_NameColor = -2; pCurrentLine->m_NameColor = -2;
if(pCurrentLine->m_TextContainerIndex != -1) if(pCurrentLine->m_TextContainerIndex != -1)

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

@ -27,6 +27,7 @@ class CChat : public CComponent
int64_t m_Time; int64_t m_Time;
float m_YOffset[2]; float m_YOffset[2];
int m_ClientID; int m_ClientID;
int m_TeamNumber;
bool m_Team; bool m_Team;
bool m_Whisper; bool m_Whisper;
int m_NameColor; int m_NameColor;