mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-19 17:14:18 +00:00
Change m_ConnectionId name
This commit is contained in:
parent
27f65cdbb0
commit
00873d839f
|
@ -157,7 +157,7 @@ int CClient::SendMsgActive(CMsgPacker *pMsg, int Flags)
|
||||||
void CClient::SendInfo(int Conn)
|
void CClient::SendInfo(int Conn)
|
||||||
{
|
{
|
||||||
CMsgPacker MsgVer(NETMSG_CLIENTVER, true);
|
CMsgPacker MsgVer(NETMSG_CLIENTVER, true);
|
||||||
MsgVer.AddRaw(&m_ConnectionID, sizeof(m_ConnectionID));
|
MsgVer.AddRaw(&m_ConnectionId, sizeof(m_ConnectionId));
|
||||||
MsgVer.AddInt(GameClient()->DDNetVersion());
|
MsgVer.AddInt(GameClient()->DDNetVersion());
|
||||||
MsgVer.AddString(GameClient()->DDNetVersionStr());
|
MsgVer.AddString(GameClient()->DDNetVersionStr());
|
||||||
SendMsg(Conn, &MsgVer, MSGFLAG_VITAL);
|
SendMsg(Conn, &MsgVer, MSGFLAG_VITAL);
|
||||||
|
@ -445,7 +445,7 @@ void CClient::Connect(const char *pAddress, const char *pPassword)
|
||||||
Disconnect();
|
Disconnect();
|
||||||
dbg_assert(m_State == IClient::STATE_OFFLINE, "Disconnect must ensure that client is offline");
|
dbg_assert(m_State == IClient::STATE_OFFLINE, "Disconnect must ensure that client is offline");
|
||||||
|
|
||||||
m_ConnectionID = RandomUuid();
|
m_ConnectionId = RandomUuid();
|
||||||
if(pAddress != m_aConnectAddressStr)
|
if(pAddress != m_aConnectAddressStr)
|
||||||
str_copy(m_aConnectAddressStr, pAddress);
|
str_copy(m_aConnectAddressStr, pAddress);
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,7 @@ class CClient : public IClient, public CDemoPlayer::IListener
|
||||||
|
|
||||||
char m_aConnectAddressStr[MAX_SERVER_ADDRESSES * NETADDR_MAXSTRSIZE] = "";
|
char m_aConnectAddressStr[MAX_SERVER_ADDRESSES * NETADDR_MAXSTRSIZE] = "";
|
||||||
|
|
||||||
CUuid m_ConnectionID = UUID_ZEROED;
|
CUuid m_ConnectionId = UUID_ZEROED;
|
||||||
|
|
||||||
bool m_HaveGlobalTcpAddr = false;
|
bool m_HaveGlobalTcpAddr = false;
|
||||||
NETADDR m_GlobalTcpAddr = NETADDR_ZEROED;
|
NETADDR m_GlobalTcpAddr = NETADDR_ZEROED;
|
||||||
|
|
|
@ -586,7 +586,7 @@ bool CServer::GetClientInfo(int ClientID, CClientInfo *pInfo) const
|
||||||
pInfo->m_DDNetVersion = m_aClients[ClientID].m_DDNetVersion >= 0 ? m_aClients[ClientID].m_DDNetVersion : VERSION_VANILLA;
|
pInfo->m_DDNetVersion = m_aClients[ClientID].m_DDNetVersion >= 0 ? m_aClients[ClientID].m_DDNetVersion : VERSION_VANILLA;
|
||||||
if(m_aClients[ClientID].m_GotDDNetVersionPacket)
|
if(m_aClients[ClientID].m_GotDDNetVersionPacket)
|
||||||
{
|
{
|
||||||
pInfo->m_pConnectionID = &m_aClients[ClientID].m_ConnectionID;
|
pInfo->m_pConnectionID = &m_aClients[ClientID].m_ConnectionId;
|
||||||
pInfo->m_pDDNetVersionStr = m_aClients[ClientID].m_aDDNetVersionStr;
|
pInfo->m_pDDNetVersionStr = m_aClients[ClientID].m_aDDNetVersionStr;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -1470,7 +1470,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
m_aClients[ClientID].m_ConnectionID = *pConnectionID;
|
m_aClients[ClientID].m_ConnectionId = *pConnectionID;
|
||||||
m_aClients[ClientID].m_DDNetVersion = DDNetVersion;
|
m_aClients[ClientID].m_DDNetVersion = DDNetVersion;
|
||||||
str_copy(m_aClients[ClientID].m_aDDNetVersionStr, pDDNetVersionStr);
|
str_copy(m_aClients[ClientID].m_aDDNetVersionStr, pDDNetVersionStr);
|
||||||
m_aClients[ClientID].m_DDNetVersionSettled = true;
|
m_aClients[ClientID].m_DDNetVersionSettled = true;
|
||||||
|
|
|
@ -177,7 +177,7 @@ public:
|
||||||
bool m_DDNetVersionSettled;
|
bool m_DDNetVersionSettled;
|
||||||
int m_DDNetVersion;
|
int m_DDNetVersion;
|
||||||
char m_aDDNetVersionStr[64];
|
char m_aDDNetVersionStr[64];
|
||||||
CUuid m_ConnectionID;
|
CUuid m_ConnectionId;
|
||||||
int64_t m_RedirectDropTime;
|
int64_t m_RedirectDropTime;
|
||||||
|
|
||||||
// DNSBL
|
// DNSBL
|
||||||
|
|
Loading…
Reference in a new issue