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

Implement whispers

Browse source
This commit is contained in:
Learath 2020-06-12 16:14:56 +03:00
parent 25664da121
commit 465fd570e0
2 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1338,6 +1338,12 @@ void *CGameContext::PreProcessMsg(int *MsgID, CUnpacker *pUnpacker, int ClientID
// Should probably use a placement new to start the lifetime of the object to avoid future weirdness
::CNetMsg_Cl_Say *pMsg = (::CNetMsg_Cl_Say *)s_aRawMsg;
if(pMsg7->m_Target >= 0)
{
// Should we maybe recraft the message so that it can go through the usual path?
WhisperID(ClientID, pMsg7->m_Target, pMsg7->m_pMessage);
return 0;
}
pMsg->m_Team = pMsg7->m_Mode == protocol7::CHAT_TEAM;
pMsg->m_pMessage = pMsg7->m_pMessage;
@ -3478,7 +3484,7 @@ void CGameContext::Whisper(int ClientID, char *pStr)
WhisperID(ClientID, Victim, pMessage);
}
void CGameContext::WhisperID(int ClientID, int VictimID, char *pMessage)
void CGameContext::WhisperID(int ClientID, int VictimID, const char *pMessage)
{
if(!CheckClientID2(ClientID))
return;
@ -3491,7 +3497,17 @@ void CGameContext::WhisperID(int ClientID, int VictimID, char *pMessage)
char aBuf[256];
if(GetClientVersion(ClientID) >= VERSION_DDNET_WHISPER)
if(Server()->IsSixup(ClientID))
{
protocol7::CNetMsg_Sv_Chat Msg;
Msg.m_ClientID = ClientID;
Msg.m_Mode = protocol7::CHAT_WHISPER;
Msg.m_pMessage = pMessage;
Msg.m_TargetID = VictimID;
Server()->SendPackMsgOne(&Msg, MSGFLAG_VITAL, ClientID);
}
else if(GetClientVersion(ClientID) >= VERSION_DDNET_WHISPER)
{
CNetMsg_Sv_Chat Msg;
Msg.m_Team = CHAT_WHISPER_SEND;
@ -3508,7 +3524,17 @@ void CGameContext::WhisperID(int ClientID, int VictimID, char *pMessage)
SendChatTarget(ClientID, aBuf);
}
if(GetClientVersion(VictimID) >= VERSION_DDNET_WHISPER)
if(Server()->IsSixup(VictimID))
{
protocol7::CNetMsg_Sv_Chat Msg;
Msg.m_ClientID = ClientID;
Msg.m_Mode = protocol7::CHAT_WHISPER;
Msg.m_pMessage = pMessage;
Msg.m_TargetID = VictimID;
Server()->SendPackMsgOne(&Msg, MSGFLAG_VITAL, VictimID);
}
else if(GetClientVersion(VictimID) >= VERSION_DDNET_WHISPER)
{
CNetMsg_Sv_Chat Msg2;
Msg2.m_Team = CHAT_WHISPER_RECV;

2
src/game/server/gamecontext.h
View file

@ -394,7 +394,7 @@ private:
bool VoteMute(const NETADDR *pAddr, int Secs, const char *pDisplayName, int AuthedID);
bool VoteUnmute(const NETADDR *pAddr, const char *pDisplayName, int AuthedID);
void Whisper(int ClientID, char *pStr);
void WhisperID(int ClientID, int VictimID, char *pMessage);
void WhisperID(int ClientID, int VictimID, const char *pMessage);
void Converse(int ClientID, char *pStr);
bool IsVersionBanned(int Version);
void UnlockTeam(int ClientID, int Team);