diff options
Diffstat (limited to 'src/engine/client')
| -rw-r--r-- | src/engine/client/client.cpp | 18 | ||||
| -rw-r--r-- | src/engine/client/srvbrowse.cpp | 23 |
2 files changed, 4 insertions, 37 deletions
diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index ccc21da7..60a2cf12 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -1081,21 +1081,16 @@ void CClient::ProcessPacket(CNetChunk *pPacket) { int PacketType = 0; if(pPacket->m_DataSize >= (int)sizeof(SERVERBROWSE_INFO) && mem_comp(pPacket->m_pData, SERVERBROWSE_INFO, sizeof(SERVERBROWSE_INFO)) == 0) - PacketType = 2; - - if(pPacket->m_DataSize >= (int)sizeof(SERVERBROWSE_OLD_INFO) && mem_comp(pPacket->m_pData, SERVERBROWSE_OLD_INFO, sizeof(SERVERBROWSE_OLD_INFO)) == 0) - PacketType = 1; + PacketType = 3; if(PacketType) { // we got ze info CUnpacker Up; CServerInfo Info = {0}; - int Token = -1; - + Up.Reset((unsigned char*)pPacket->m_pData+sizeof(SERVERBROWSE_INFO), pPacket->m_DataSize-sizeof(SERVERBROWSE_INFO)); - if(PacketType >= 2) - Token = str_toint(Up.GetString()); + int Token = str_toint(Up.GetString()); str_copy(Info.m_aVersion, Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES), sizeof(Info.m_aVersion)); str_copy(Info.m_aName, Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES), sizeof(Info.m_aName)); str_copy(Info.m_aMap, Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES), sizeof(Info.m_aMap)); @@ -1130,12 +1125,7 @@ void CClient::ProcessPacket(CNetChunk *pPacket) m_CurrentServerInfoRequestTime = -1; } else - { - if(PacketType == 2) - m_ServerBrowser.Set(pPacket->m_Address, IServerBrowser::SET_TOKEN, Token, &Info); - else - m_ServerBrowser.Set(pPacket->m_Address, IServerBrowser::SET_OLD_INTERNET, -1, &Info); - } + m_ServerBrowser.Set(pPacket->m_Address, IServerBrowser::SET_TOKEN, Token, &Info); } } } diff --git a/src/engine/client/srvbrowse.cpp b/src/engine/client/srvbrowse.cpp index 540cadf3..a023b878 100644 --- a/src/engine/client/srvbrowse.cpp +++ b/src/engine/client/srvbrowse.cpp @@ -437,29 +437,6 @@ void CServerBrowser::Set(const NETADDR &Addr, int Type, int Token, const CServer RemoveRequest(pEntry); } } - else if(Type == IServerBrowser::SET_OLD_INTERNET) - { - pEntry = Find(Addr); - if(pEntry) - { - SetInfo(pEntry, *pInfo); - - if(m_ServerlistType == IServerBrowser::TYPE_LAN) - pEntry->m_Info.m_Latency = min(static_cast<int>((time_get()-m_BroadcastTime)*1000/time_freq()), 999); - else - pEntry->m_Info.m_Latency = min(static_cast<int>((time_get()-pEntry->m_RequestTime)*1000/time_freq()), 999); - RemoveRequest(pEntry); - } - } - else if(Type == IServerBrowser::SET_OLD_LAN) - { - pEntry = Find(Addr); - if(pEntry) - if(!pEntry) - pEntry = Add(Addr); - if(pEntry) - SetInfo(pEntry, *pInfo); - } Sort(); } |