Skip to content

Commit 2d69eb4

Browse files
ccw808ccw808
committed
Refactored ASE flags
1 parent efe0d2f commit 2d69eb4

File tree

4 files changed

+62
-54
lines changed

4 files changed

+62
-54
lines changed

‎Client/core/Serverbrowser/CServerBrowser.RemoteMasterServer.cpp

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -353,24 +353,22 @@ bool CRemoteMasterServer::ParseListVer2(CServerListItemList& itemList)
353353
uint uiFlags = 0;
354354
stream.Read(uiFlags);
355355

356-
// bool bHasAddress = ( uiFlags & ASE_FLAG_ADDRESS ) != 0;
357-
// bool bHasPort = ( uiFlags & ASE_FLAG_PORT ) != 0;
358-
bool bHasPlayerCount = (uiFlags & ASE_FLAG_PLAYER_COUNT) != 0;
359-
bool bHasMaxPlayerCount = (uiFlags & ASE_FLAG_MAX_PLAYER_COUNT) != 0;
360-
bool bHasGameName = (uiFlags & ASE_FLAG_GAME_NAME) != 0;
361-
bool bHasName = (uiFlags & ASE_FLAG_NAME) != 0;
362-
bool bHasGameMode = (uiFlags & ASE_FLAG_GAME_MODE) != 0;
363-
bool bHasMap = (uiFlags & ASE_FLAG_MAP) != 0;
364-
bool bHasVersion = (uiFlags & ASE_FLAG_VERSION) != 0;
365-
bool bHasPassworded = (uiFlags & ASE_FLAG_PASSWORDED) != 0;
366-
bool bHasSerials = (uiFlags & ASE_FLAG_SERIALS) != 0;
367-
bool bHasPlayers = (uiFlags & ASE_FLAG_PLAYER_LIST) != 0;
368-
bool bHasRespondingFlag = (uiFlags & ASE_FLAG_RESPONDING) != 0;
369-
bool bHasRestrictionFlags = (uiFlags & ASE_FLAG_RESTRICTIONS) != 0;
370-
bool bHasSearchIgnoreSections = (uiFlags & ASE_FLAG_SEARCH_IGNORE_SECTIONS) != 0;
371-
bool bHasKeepFlag = (uiFlags & ASE_FLAG_KEEP) != 0;
372-
bool bHasHttpPort = (uiFlags & ASE_FLAG_HTTP_PORT) != 0;
373-
bool bHasSpecialFlags = (uiFlags & ASE_FLAG_SPECIAL_FLAGS) != 0;
356+
bool bHasPlayerCount = (uiFlags & ASE_HAS_PLAYER_COUNT) != 0;
357+
bool bHasMaxPlayerCount = (uiFlags & ASE_HAS_MAX_PLAYER_COUNT) != 0;
358+
bool bHasGameName = (uiFlags & ASE_HAS_GAME_NAME) != 0;
359+
bool bHasName = (uiFlags & ASE_HAS_SERVER_NAME) != 0;
360+
bool bHasGameMode = (uiFlags & ASE_HAS_GAME_MODE) != 0;
361+
bool bHasMap = (uiFlags & ASE_HAS_MAP_NAME) != 0;
362+
bool bHasVersion = (uiFlags & ASE_HAS_SERVER_VERSION) != 0;
363+
bool bHasPassworded = (uiFlags & ASE_HAS_PASSWORDED_FLAG) != 0;
364+
bool bHasSerials = (uiFlags & ASE_HAS_SERIALS_FLAG) != 0;
365+
bool bHasPlayers = (uiFlags & ASE_HAS_PLAYER_LIST) != 0;
366+
bool bHasRespondingFlag = (uiFlags & ASE_HAS_RESPONDING_FLAG) != 0;
367+
bool bHasRestrictionFlags = (uiFlags & ASE_HAS_RESTRICTION_FLAGS) != 0;
368+
bool bHasSearchIgnoreSections = (uiFlags & ASE_HAS_SEARCH_IGNORE_SECTIONS) != 0;
369+
bool bHasKeepFlag = (uiFlags & ASE_HAS_KEEP_FLAG) != 0;
370+
bool bHasHttpPort = (uiFlags & ASE_HAS_HTTP_PORT) != 0;
371+
bool bHasSpecialFlags = (uiFlags & ASE_HAS_SPECIAL_FLAGS) != 0;
374372

375373
// Rate quality of data supplied here
376374
uint uiDataQuality = SERVER_INFO_ASE_2;

‎Client/core/Serverbrowser/CServerBrowser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ void CServerBrowser::AddServerToList(const CServerListItem* pServer, const Serve
10461046
bool bIsFull = (pServer->nPlayers >= pServer->nMaxPlayers) && (pServer->nMaxPlayers != 0);
10471047
bool bIsLocked = pServer->bPassworded;
10481048
bool bIsBlockedVersion = bIsOtherVersion && !CanBrowseVersion(pServer->strVersion);
1049-
bool bIsBlockedServer = (pServer->uiMasterServerSaysRestrictions & ASE_FLAG_RESTRICTIONS) != false;
1049+
bool bIsBlockedServer = (pServer->uiMasterServerSaysRestrictions & RESTRICTION_BLOCK_SERVER) != false;
10501050

10511051
if ((!pServer->strVersion.empty() || bIsOffline) && (!bLowQuality || bIsOffline) && (!bIsEmpty || bIncludeEmpty) && (!bIsFull || bIncludeFull) &&
10521052
(!bIsLocked || bIncludeLocked) && (!bIsOffline || bIncludeOffline || bWasGoodNowFailing) && (!bIsOtherVersion || bIncludeOtherVersions) &&

‎Client/core/Serverbrowser/CServerList.cpp

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -537,38 +537,35 @@ bool CServerListItem::ParseQuery(const char* szBuffer, unsigned int nLength)
537537
// Game
538538
if (!ReadString(strTemp, szBuffer, i, nLength))
539539
return false;
540-
if ((uiMasterServerSaysRestrictions & ASE_FLAG_GAME_NAME) == false)
540+
if ((uiMasterServerSaysRestrictions & RESTRICTION_GAME_NAME) == false)
541541
strGameName = strTemp;
542542

543-
// Port
543+
// Port (Ignore result as we must already have the correct value)
544544
if (!ReadString(strTemp, szBuffer, i, nLength))
545545
return false;
546-
// Don't update port here. We must already have the correct value.
547-
// if ( ( uiMasterServerSaysRestrictions & ASE_FLAG_PORT ) == false )
548-
// ChangeAddress( Address, atoi ( strTemp.c_str () ) );
549546

550547
// Server name
551548
if (!ReadString(strTemp, szBuffer, i, nLength))
552549
return false;
553-
if ((uiMasterServerSaysRestrictions & ASE_FLAG_NAME) == false)
550+
if ((uiMasterServerSaysRestrictions & RESTRICTION_SERVER_NAME) == false)
554551
strName = strTemp;
555552

556553
// Game type
557554
if (!ReadString(strTemp, szBuffer, i, nLength))
558555
return false;
559-
if ((uiMasterServerSaysRestrictions & ASE_FLAG_GAME_MODE) == false)
556+
if ((uiMasterServerSaysRestrictions & RESTRICTION_GAME_MODE) == false)
560557
strGameMode = strTemp;
561558

562559
// Map name
563560
if (!ReadString(strMapTemp, szBuffer, i, nLength))
564561
return false;
565-
if ((uiMasterServerSaysRestrictions & ASE_FLAG_MAP) == false)
562+
if ((uiMasterServerSaysRestrictions & RESTRICTION_MAP_NAME) == false)
566563
strMap = strMapTemp;
567564

568565
// Version
569566
if (!ReadString(strTemp, szBuffer, i, nLength))
570567
return false;
571-
if ((uiMasterServerSaysRestrictions & ASE_FLAG_VERSION) == false)
568+
if ((uiMasterServerSaysRestrictions & RESTRICTION_SERVER_VERSION) == false)
572569
strVersion = strTemp;
573570

574571
// Got space for password, serial verification, player count, players max?
@@ -577,19 +574,19 @@ bool CServerListItem::ParseQuery(const char* szBuffer, unsigned int nLength)
577574
return false;
578575
}
579576

580-
if ((uiMasterServerSaysRestrictions & ASE_FLAG_PASSWORDED) == false)
577+
if ((uiMasterServerSaysRestrictions & RESTRICTION_PASSWORDED_FLAG) == false)
581578
bPassworded = (szBuffer[i] == 1);
582579
i++;
583580

584-
if ((uiMasterServerSaysRestrictions & ASE_FLAG_SERIALS) == false)
581+
if ((uiMasterServerSaysRestrictions & RESTRICTION_SERIALS_FLAG) == false)
585582
bSerials = (szBuffer[i] == 1);
586583
i++;
587584

588-
if ((uiMasterServerSaysRestrictions & ASE_FLAG_PLAYER_COUNT) == false)
585+
if ((uiMasterServerSaysRestrictions & RESTRICTION_PLAYER_COUNT) == false)
589586
nPlayers = (unsigned char)szBuffer[i];
590587
i++;
591588

592-
if ((uiMasterServerSaysRestrictions & ASE_FLAG_MAX_PLAYER_COUNT) == false)
589+
if ((uiMasterServerSaysRestrictions & RESTRICTION_MAX_PLAYER_COUNT) == false)
593590
nMaxPlayers = (unsigned char)szBuffer[i];
594591
i++;
595592

@@ -600,9 +597,9 @@ bool CServerListItem::ParseQuery(const char* szBuffer, unsigned int nLength)
600597
SString strJoinedPlayers, strMaxPlayers;
601598
if (strPlayerCount.Split("/", &strJoinedPlayers, &strMaxPlayers))
602599
{
603-
if ((uiMasterServerSaysRestrictions & ASE_FLAG_PLAYER_COUNT) == false)
600+
if ((uiMasterServerSaysRestrictions & RESTRICTION_PLAYER_COUNT) == false)
604601
nPlayers = atoi(strJoinedPlayers);
605-
if ((uiMasterServerSaysRestrictions & ASE_FLAG_MAX_PLAYER_COUNT) == false)
602+
if ((uiMasterServerSaysRestrictions & RESTRICTION_MAX_PLAYER_COUNT) == false)
606603
nMaxPlayers = atoi(strMaxPlayers);
607604
}
608605
}
@@ -645,7 +642,7 @@ bool CServerListItem::ParseQuery(const char* szBuffer, unsigned int nLength)
645642
SString strResult = RemoveColorCodes(strPlayer.c_str());
646643
if (strResult.length() == 0)
647644
strResult = strPlayer;
648-
if ((uiMasterServerSaysRestrictions & ASE_FLAG_PLAYER_LIST) == false)
645+
if ((uiMasterServerSaysRestrictions & RESTRICTION_PLAYER_LIST) == false)
649646
vecPlayers.push_back(strResult);
650647
}
651648
}

‎Client/core/Serverbrowser/CServerList.h

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,37 @@ class CMasterServerManagerInterface;
4343

4444
enum
4545
{
46-
ASE_FLAG_ADDRESS = 0x0001,
47-
ASE_FLAG_PORT = 0x0002,
48-
ASE_FLAG_PLAYER_COUNT = 0x0004,
49-
ASE_FLAG_MAX_PLAYER_COUNT = 0x0008,
50-
ASE_FLAG_GAME_NAME = 0x0010,
51-
ASE_FLAG_NAME = 0x0020,
52-
ASE_FLAG_GAME_MODE = 0x0040,
53-
ASE_FLAG_MAP = 0x0080,
54-
ASE_FLAG_VERSION = 0x0100,
55-
ASE_FLAG_PASSWORDED = 0x0200,
56-
ASE_FLAG_SERIALS = 0x0400,
57-
ASE_FLAG_PLAYER_LIST = 0x0800,
58-
ASE_FLAG_RESPONDING = 0x1000,
59-
ASE_FLAG_RESTRICTIONS = 0x2000,
60-
ASE_FLAG_SEARCH_IGNORE_SECTIONS = 0x4000,
61-
ASE_FLAG_KEEP = 0x8000,
62-
ASE_FLAG_HTTP_PORT = 0x080000,
63-
ASE_FLAG_SPECIAL_FLAGS = 0x100000,
46+
ASE_HAS_PLAYER_COUNT = 0x0004,
47+
ASE_HAS_MAX_PLAYER_COUNT = 0x0008,
48+
ASE_HAS_GAME_NAME = 0x0010,
49+
ASE_HAS_SERVER_NAME = 0x0020,
50+
ASE_HAS_GAME_MODE = 0x0040,
51+
ASE_HAS_MAP_NAME = 0x0080,
52+
ASE_HAS_SERVER_VERSION = 0x0100,
53+
ASE_HAS_PASSWORDED_FLAG = 0x0200,
54+
ASE_HAS_SERIALS_FLAG = 0x0400,
55+
ASE_HAS_PLAYER_LIST = 0x0800,
56+
ASE_HAS_RESPONDING_FLAG = 0x1000,
57+
ASE_HAS_RESTRICTION_FLAGS = 0x2000,
58+
ASE_HAS_SEARCH_IGNORE_SECTIONS = 0x4000,
59+
ASE_HAS_KEEP_FLAG = 0x8000,
60+
ASE_HAS_HTTP_PORT = 0x080000,
61+
ASE_HAS_SPECIAL_FLAGS = 0x100000,
62+
};
63+
64+
enum
65+
{
66+
RESTRICTION_PLAYER_COUNT = 0x0004,
67+
RESTRICTION_MAX_PLAYER_COUNT = 0x0008,
68+
RESTRICTION_GAME_NAME = 0x0010,
69+
RESTRICTION_SERVER_NAME = 0x0020,
70+
RESTRICTION_GAME_MODE = 0x0040,
71+
RESTRICTION_MAP_NAME = 0x0080,
72+
RESTRICTION_SERVER_VERSION = 0x0100,
73+
RESTRICTION_PASSWORDED_FLAG = 0x0200,
74+
RESTRICTION_SERIALS_FLAG = 0x0400,
75+
RESTRICTION_PLAYER_LIST = 0x0800,
76+
RESTRICTION_BLOCK_SERVER = 0x2000,
6477
};
6578

6679
enum
@@ -417,4 +430,4 @@ class CServerListLAN : public CServerList
417430
unsigned long m_ulStartTime;
418431
};
419432

420-
#endif
433+
#endif

0 commit comments

Comments
 (0)