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

Merge #2351

Browse source 
2351: Ugly fix for SendChatTarget(-1...). r=def- a=Learath2

Another horrendous fix

Co-authored-by: Learath <learath2@gmail.com>
This commit is contained in:
bors[bot] 2020-06-24 16:14:39 +00:00 committed by GitHub
parent 69808f829e e122462ae8
commit b3f76f055b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/game/server/gamecontext.cpp
View file

@ -335,18 +335,31 @@ void CGameContext::CallVote(int ClientID, const char *pDesc, const char *pCmd, c
void CGameContext::SendChatTarget(int To, const char *pText, int Flags) void CGameContext::SendChatTarget(int To, const char *pText, int Flags)
{ {
if(!((Server()->IsSixup(To) && (Flags & CHAT_SIXUP)) ||
(!Server()->IsSixup(To) && (Flags & CHAT_SIX))))
return;
CNetMsg_Sv_Chat Msg; CNetMsg_Sv_Chat Msg;
Msg.m_Team = 0; Msg.m_Team = 0;
Msg.m_ClientID = -1; Msg.m_ClientID = -1;
Msg.m_pMessage = pText; Msg.m_pMessage = pText;
if(g_Config.m_SvDemoChat)
Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, To); const int MsgFlags = g_Config.m_SvDemoChat ? MSGFLAG_VITAL : MSGFLAG_VITAL|MSGFLAG_NORECORD;
if(To == -1)
{
for(int i = 0; i < MAX_CLIENTS; i++)
{
if(!((Server()->IsSixup(i) && (Flags & CHAT_SIXUP)) ||
(!Server()->IsSixup(i) && (Flags & CHAT_SIX))))
continue;
Server()->SendPackMsg(&Msg, MsgFlags, i);
}
}
else else
Server()->SendPackMsg(&Msg, MSGFLAG_VITAL|MSGFLAG_NORECORD, To); {
if(!((Server()->IsSixup(To) && (Flags & CHAT_SIXUP)) ||
(!Server()->IsSixup(To) && (Flags & CHAT_SIX))))
return;
Server()->SendPackMsg(&Msg, MsgFlags, To);
}
} }
void CGameContext::SendChatTeam(int Team, const char *pText) void CGameContext::SendChatTeam(int Team, const char *pText)