diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 426b04b51..3983399c1 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -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) diff --git a/src/engine/shared/protocol.h b/src/engine/shared/protocol.h index f954f4010..d1e522e70 100644 --- a/src/engine/shared/protocol.h +++ b/src/engine/shared/protocol.h @@ -79,7 +79,6 @@ enum { SERVER_TICK_SPEED=50, SERVER_FLAG_PASSWORD = 0x1, - SERVER_FLAG_ISDDNET = 0x2, MAX_CLIENTS=64, VANILLA_MAX_CLIENTS=16, diff --git a/src/engine/shared/serverbrowser.cpp b/src/engine/shared/serverbrowser.cpp index 84d2c078e..077e14365 100644 --- a/src/engine/shared/serverbrowser.cpp +++ b/src/engine/shared/serverbrowser.cpp @@ -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); }