From eff28c658ae52d1b9215146f000ec4b82ceb4b62 Mon Sep 17 00:00:00 2001 From: Learath Date: Fri, 12 Jun 2020 16:42:13 +0300 Subject: [PATCH] Fix server messages --- src/engine/server.h | 2 +- src/game/server/gamecontext.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/server.h b/src/engine/server.h index 0868dc18e..947a8bba5 100644 --- a/src/engine/server.h +++ b/src/engine/server.h @@ -95,7 +95,7 @@ public: pMsg->m_ClientID = VANILLA_MAX_CLIENTS - 1; } - if(pMsg->m_ClientID >= 0 && IsSixup(ClientID)) + if(IsSixup(ClientID)) { protocol7::CNetMsg_Sv_Chat Msg7; Msg7.m_ClientID = pMsg->m_ClientID; diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index a15d036a5..6b3a85199 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -384,7 +384,7 @@ void CGameContext::SendChat(int ChatterClientID, int Team, const char *pText, in // send to the clients for(int i = 0; i < MAX_CLIENTS; i++) { - if(m_apPlayers[i] != 0 && !m_apPlayers[i]->m_DND && Server()->IsSixup(i) == (Flags & CHAT_SIXUP)) + if(m_apPlayers[i] != 0 && !m_apPlayers[i]->m_DND && Server()->IsSixup(i) == !!(Flags & CHAT_SIXUP)) Server()->SendPackMsg(&Msg, MSGFLAG_VITAL|MSGFLAG_NORECORD, i); } }