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

Revert "Implement ISDDNET. Deprecates #1320"

Browse source 
This reverts commit 1929bc6739.
This commit is contained in:
heinrich5991 2019-06-05 01:03:49 +02:00
parent a7857d58c4
commit 62846821da
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/engine/server/server.cpp
View file

@ -1566,10 +1566,7 @@ void CServer::SendServerInfo(const NETADDR *pAddr, int Token, int Type, bool Sen
p.AddString(GameServer()->GameType(), 16);
// flags
int Flags = SERVER_FLAG_ISDDNET;
if(g_Config.m_Password[0])
Flags |= SERVER_FLAG_PASSWORD;
ADD_INT(p, Flags);
ADD_INT(p, g_Config.m_Password[0] ? SERVER_FLAG_PASSWORD : 0);
int MaxClients = m_NetServer.MaxClients();
if(Type == SERVERINFO_VANILLA || Type == SERVERINFO_INGAME)

1
src/engine/shared/protocol.h
View file

@ -79,7 +79,6 @@ enum
{
SERVER_TICK_SPEED=50,
SERVER_FLAG_PASSWORD = 0x1,
SERVER_FLAG_ISDDNET = 0x2,
MAX_CLIENTS=64,
VANILLA_MAX_CLIENTS=16,

3
src/engine/shared/serverbrowser.cpp
View file

@ -60,8 +60,7 @@ bool IsBlockWorlds(const CServerInfo *pInfo)
bool IsDDNet(const CServerInfo *pInfo)
{
return (pInfo->m_Flags & SERVER_FLAG_ISDDNET
|| str_find_nocase(pInfo->m_aGameType, "ddracenet")
return (str_find_nocase(pInfo->m_aGameType, "ddracenet")
|| str_find_nocase(pInfo->m_aGameType, "ddnet"))
&& !IsBlockInfectionZ(pInfo);
}