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

More template magic. Cleans up 'send-to-all-sixup'

Browse source
This commit is contained in:
Learath 2020-06-15 16:37:09 +03:00
parent 9e2434c65d
commit 4067e711ef
3 changed files with 57 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/engine/server.h
View file

@ -3,6 +3,8 @@
#ifndef ENGINE_SERVER_H #ifndef ENGINE_SERVER_H
#define ENGINE_SERVER_H #define ENGINE_SERVER_H
#include <type_traits>
#include <base/hash.h> #include <base/hash.h>
#include <base/math.h> #include <base/math.h>
@ -54,10 +56,10 @@ public:
virtual int SendMsg(CMsgPacker *pMsg, int Flags, int ClientID) = 0; virtual int SendMsg(CMsgPacker *pMsg, int Flags, int ClientID) = 0;
template<class T> template<class T, typename std::enable_if<!protocol7::is_sixup<T>::value, int>::type = 0>
int SendPackMsg(T *pMsg, int Flags, int ClientID) inline int SendPackMsg(T *pMsg, int Flags, int ClientID)
{ {
int result = 0; int Result = 0;
T tmp; T tmp;
if (ClientID == -1) if (ClientID == -1)
{ {
@ -65,13 +67,29 @@ public:
if(ClientIngame(i)) if(ClientIngame(i))
{ {
mem_copy(&tmp, pMsg, sizeof(T)); mem_copy(&tmp, pMsg, sizeof(T));
result = SendPackMsgTranslate(&tmp, Flags, i); Result = SendPackMsgTranslate(&tmp, Flags, i);
} }
} else { } else {
mem_copy(&tmp, pMsg, sizeof(T)); mem_copy(&tmp, pMsg, sizeof(T));
result = SendPackMsgTranslate(&tmp, Flags, ClientID); Result = SendPackMsgTranslate(&tmp, Flags, ClientID);
} }
return result; return Result;
}
template<class T, typename std::enable_if<protocol7::is_sixup<T>::value, int>::type = 1>
inline int SendPackMsg(T *pMsg, int Flags, int ClientID)
{
int Result = 0;
if(ClientID == -1)
{
for(int i = 0; i < MAX_CLIENTS; i++)
if(ClientIngame(i) && IsSixup(i))
Result = SendPackMsgOne(pMsg, Flags, i);
}
else if(IsSixup(ClientID))
Result = SendPackMsgOne(pMsg, Flags, ClientID);
return Result;
} }
template<class T> template<class T>
@ -119,6 +137,7 @@ public:
template<class T> template<class T>
int SendPackMsgOne(T *pMsg, int Flags, int ClientID) int SendPackMsgOne(T *pMsg, int Flags, int ClientID)
{ {
dbg_assert(ClientID != -1, "SendPackMsgOne called with -1");
CMsgPacker Packer(pMsg->MsgID(), false, protocol7::is_sixup<T>::value); CMsgPacker Packer(pMsg->MsgID(), false, protocol7::is_sixup<T>::value);
if(pMsg->Pack(&Packer)) if(pMsg->Pack(&Packer))

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

@ -1116,6 +1116,24 @@ void CGameContext::OnClientEnter(int ClientID)
Server()->ExpireServerInfo(); Server()->ExpireServerInfo();
CPlayer *pNewPlayer = m_apPlayers[ClientID]; CPlayer *pNewPlayer = m_apPlayers[ClientID];
// new info for others
protocol7::CNetMsg_Sv_ClientInfo NewClientInfoMsg;
NewClientInfoMsg.m_ClientID = ClientID;
NewClientInfoMsg.m_Local = 0;
NewClientInfoMsg.m_Team = pNewPlayer->GetTeam();
NewClientInfoMsg.m_pName = Server()->ClientName(ClientID);
NewClientInfoMsg.m_pClan = Server()->ClientClan(ClientID);
NewClientInfoMsg.m_Country = Server()->ClientCountry(ClientID);
NewClientInfoMsg.m_Silent = false;
for(int p = 0; p < 6; p++)
{
NewClientInfoMsg.m_apSkinPartNames[p] = pNewPlayer->m_TeeInfos.m_apSkinPartNames[p];
NewClientInfoMsg.m_aUseCustomColors[p] = pNewPlayer->m_TeeInfos.m_aUseCustomColors[p];
NewClientInfoMsg.m_aSkinPartColors[p] = pNewPlayer->m_TeeInfos.m_aSkinPartColors[p];
}
// update client infos (others before local) // update client infos (others before local)
for(int i = 0; i < MAX_CLIENTS; ++i) for(int i = 0; i < MAX_CLIENTS; ++i)
{ {
@ -1125,26 +1143,7 @@ void CGameContext::OnClientEnter(int ClientID)
CPlayer *pPlayer = m_apPlayers[i]; CPlayer *pPlayer = m_apPlayers[i];
if(Server()->IsSixup(i)) if(Server()->IsSixup(i))
{ Server()->SendPackMsg(&NewClientInfoMsg, MSGFLAG_VITAL|MSGFLAG_NORECORD, i);
// new info for others
protocol7::CNetMsg_Sv_ClientInfo NewClientInfoMsg;
NewClientInfoMsg.m_ClientID = ClientID;
NewClientInfoMsg.m_Local = 0;
NewClientInfoMsg.m_Team = pNewPlayer->GetTeam();
NewClientInfoMsg.m_pName = Server()->ClientName(ClientID);
NewClientInfoMsg.m_pClan = Server()->ClientClan(ClientID);
NewClientInfoMsg.m_Country = Server()->ClientCountry(ClientID);
NewClientInfoMsg.m_Silent = false;
for(int p = 0; p < 6; p++)
{
NewClientInfoMsg.m_apSkinPartNames[p] = pNewPlayer->m_TeeInfos.m_apSkinPartNames[p];
NewClientInfoMsg.m_aUseCustomColors[p] = pNewPlayer->m_TeeInfos.m_aUseCustomColors[p];
NewClientInfoMsg.m_aSkinPartColors[p] = pNewPlayer->m_TeeInfos.m_aSkinPartColors[p];
}
Server()->SendPackMsgOne(&NewClientInfoMsg, MSGFLAG_VITAL|MSGFLAG_NORECORD, i);
}
if(Server()->IsSixup(ClientID)) if(Server()->IsSixup(ClientID))
{ {
@ -1165,30 +1164,15 @@ void CGameContext::OnClientEnter(int ClientID)
ClientInfoMsg.m_aSkinPartColors[p] = pPlayer->m_TeeInfos.m_aSkinPartColors[p]; ClientInfoMsg.m_aSkinPartColors[p] = pPlayer->m_TeeInfos.m_aSkinPartColors[p];
} }
Server()->SendPackMsgOne(&ClientInfoMsg, MSGFLAG_VITAL|MSGFLAG_NORECORD, ClientID); Server()->SendPackMsg(&ClientInfoMsg, MSGFLAG_VITAL|MSGFLAG_NORECORD, ClientID);
} }
} }
// local info // local info
if(Server()->IsSixup(ClientID)) if(Server()->IsSixup(ClientID))
{ {
protocol7::CNetMsg_Sv_ClientInfo SelfClientInfoMsg; NewClientInfoMsg.m_Local = 1;
SelfClientInfoMsg.m_ClientID = ClientID; Server()->SendPackMsg(&NewClientInfoMsg, MSGFLAG_VITAL|MSGFLAG_NORECORD, ClientID);
SelfClientInfoMsg.m_Local = 1;
SelfClientInfoMsg.m_Team = pNewPlayer->GetTeam();
SelfClientInfoMsg.m_pName = Server()->ClientName(ClientID);
SelfClientInfoMsg.m_pClan = Server()->ClientClan(ClientID);
SelfClientInfoMsg.m_Country = Server()->ClientCountry(ClientID);
SelfClientInfoMsg.m_Silent = 0;
for(int p = 0; p < 6; p++)
{
SelfClientInfoMsg.m_apSkinPartNames[p] = pNewPlayer->m_TeeInfos.m_apSkinPartNames[p];
SelfClientInfoMsg.m_aUseCustomColors[p] = pNewPlayer->m_TeeInfos.m_aUseCustomColors[p];
SelfClientInfoMsg.m_aSkinPartColors[p] = pNewPlayer->m_TeeInfos.m_aSkinPartColors[p];
}
Server()->SendPackMsgOne(&SelfClientInfoMsg, MSGFLAG_VITAL|MSGFLAG_NORECORD, ClientID);
} }
} }
@ -1396,9 +1380,7 @@ void *CGameContext::PreProcessMsg(int *MsgID, CUnpacker *pUnpacker, int ClientID
Msg.m_aUseCustomColors[p] = pMsg->m_aUseCustomColors[p]; Msg.m_aUseCustomColors[p] = pMsg->m_aUseCustomColors[p];
} }
for(int i = 0; i < MAX_CLIENTS; i++) Server()->SendPackMsg(&Msg, MSGFLAG_VITAL|MSGFLAG_NORECORD, -1);
if(Server()->IsSixup(i))
Server()->SendPackMsgOne(&Msg, MSGFLAG_VITAL|MSGFLAG_NORECORD, i);
return 0; return 0;
} }
@ -1979,16 +1961,7 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
SkinChangeMsg.m_aUseCustomColors[p] = pPlayer->m_TeeInfos.m_aUseCustomColors[p]; SkinChangeMsg.m_aUseCustomColors[p] = pPlayer->m_TeeInfos.m_aUseCustomColors[p];
} }
//TODO: Common pattern send-to-sixup could be abstracted out Server()->SendPackMsg(&SkinChangeMsg, MSGFLAG_VITAL|MSGFLAG_NORECORD, -1);
for(int i = 0; i < MAX_CLIENTS; i++)
{
if(Server()->IsSixup(i))
{
dbg_msg("debug", "sending to %d", i);
Server()->SendPackMsgOne(&SkinChangeMsg, MSGFLAG_VITAL, i);
}
}
Server()->ExpireServerInfo(); Server()->ExpireServerInfo();
} }
else if (MsgID == NETMSGTYPE_CL_EMOTICON && !m_World.m_Paused) else if (MsgID == NETMSGTYPE_CL_EMOTICON && !m_World.m_Paused)
@ -3559,7 +3532,7 @@ void CGameContext::WhisperID(int ClientID, int VictimID, const char *pMessage)
Msg.m_pMessage = pMessage; Msg.m_pMessage = pMessage;
Msg.m_TargetID = VictimID; Msg.m_TargetID = VictimID;
Server()->SendPackMsgOne(&Msg, MSGFLAG_VITAL|MSGFLAG_NORECORD, ClientID); Server()->SendPackMsg(&Msg, MSGFLAG_VITAL|MSGFLAG_NORECORD, ClientID);
} }
else if(GetClientVersion(ClientID) >= VERSION_DDNET_WHISPER) else if(GetClientVersion(ClientID) >= VERSION_DDNET_WHISPER)
{ {
@ -3586,7 +3559,7 @@ void CGameContext::WhisperID(int ClientID, int VictimID, const char *pMessage)
Msg.m_pMessage = pMessage; Msg.m_pMessage = pMessage;
Msg.m_TargetID = VictimID; Msg.m_TargetID = VictimID;
Server()->SendPackMsgOne(&Msg, MSGFLAG_VITAL|MSGFLAG_NORECORD, VictimID); Server()->SendPackMsg(&Msg, MSGFLAG_VITAL|MSGFLAG_NORECORD, VictimID);
} }
else if(GetClientVersion(VictimID) >= VERSION_DDNET_WHISPER) else if(GetClientVersion(VictimID) >= VERSION_DDNET_WHISPER)
{ {

18
src/game/server/player.cpp
View file

@ -610,18 +610,12 @@ void CPlayer::SetTeam(int Team, bool DoChatMsg)
//GameServer()->m_pController->OnPlayerInfoChange(GameServer()->m_apPlayers[m_ClientID]); //GameServer()->m_pController->OnPlayerInfoChange(GameServer()->m_apPlayers[m_ClientID]);
for(int i = 0; i < MAX_CLIENTS; i++) protocol7::CNetMsg_Sv_Team Msg;
{ Msg.m_ClientID = m_ClientID;
if(Server()->ClientIngame(i) && Server()->IsSixup(i)) Msg.m_Team = m_Team;
{ Msg.m_Silent = !DoChatMsg;
protocol7::CNetMsg_Sv_Team Msg; Msg.m_CooldownTick = m_LastSetTeam + Server()->TickSpeed() * g_Config.m_SvTeamChangeDelay;
Msg.m_ClientID = m_ClientID; Server()->SendPackMsg(&Msg, MSGFLAG_VITAL|MSGFLAG_NORECORD, -1);
Msg.m_Team = m_Team;
Msg.m_Silent = !DoChatMsg;
Msg.m_CooldownTick = m_LastSetTeam + Server()->TickSpeed() * g_Config.m_SvTeamChangeDelay;
Server()->SendPackMsgOne(&Msg, MSGFLAG_VITAL|MSGFLAG_NORECORD, i);
}
}
if(Team == TEAM_SPECTATORS) if(Team == TEAM_SPECTATORS)
{ {