Add support for unverified player count

Your server implementation must encode the ping status as [0x728D, player count as uint16_t, 0xFFFF]

Author: botder

Client/core/CQueryReceiver.cpp

@@ -183,7 +183,7 @@ SQueryInfo CQueryReceiver::GetServerResponse()
 
         // Recover server ping status if present
         const SString strPingStatus = strBuildNumber.Right(strBuildNumber.length() - strlen(strBuildNumber) - 1);
-        CCore::GetSingleton().GetNetwork()->UpdatePingStatus(*strPingStatus, info.players);
+        CCore::GetSingleton().GetNetwork()->UpdatePingStatus(*strPingStatus, info.players, info.isStatusVerified);
 
         // Recover server http port if present
         const SString strNetRoute = strPingStatus.Right(strPingStatus.length() - strlen(strPingStatus) - 1);

Client/core/CQueryReceiver.h

@@ -16,6 +16,7 @@ struct SQueryInfo
     {
         containingInfo = false;
         port = 0;
+        isStatusVerified = true;
         isPassworded = false;
         serials = false;
         players = 0;
@@ -33,6 +34,7 @@ struct SQueryInfo
     SString gameType;
     SString mapName;
     SString versionText;
+    bool    isStatusVerified;
     bool    isPassworded;
     bool    serials;
     ushort  players;

Client/core/ServerBrowser/CServerBrowser.cpp

@@ -1081,7 +1081,8 @@ void CServerBrowser::AddServerToList(CServerListItem* pServer, const ServerBrows
         const SString strVersion = !bIncludeOtherVersions ? "" : pServer->strVersion;
         const SString strVersionSortKey = pServer->strVersionSortKey + pServer->strTieBreakSortKey;
 
-        const SString strPlayers = pServer->nMaxPlayers == 0 ? "" : SString("%d / %d", pServer->nPlayers, pServer->nMaxPlayers);
+        const SString strVerified = pServer->isStatusVerified ? "" : "*";
+        const SString strPlayers = pServer->nMaxPlayers == 0 ? "" : SString("%d / %d %s", pServer->nPlayers, pServer->nMaxPlayers, *strVerified);
         const SString strPlayersSortKey = SString("%04d-", pServer->nMaxPlayers ? pServer->nPlayers + 1 : 0) + pServer->strTieBreakSortKey;
 
         const SString strPing = pServer->nPing == 9999 ? "" : SString("%d", pServer->nPing);
@@ -1125,6 +1126,12 @@ void CServerBrowser::AddServerToList(CServerListItem* pServer, const ServerBrows
         m_pServerList[Type]->SetItemColor(iIndex, m_hPing[Type], color.R, color.G, color.B, color.A);
         m_pServerList[Type]->SetItemColor(iIndex, m_hGame[Type], color.R, color.G, color.B, color.A);
 
+        if (!pServer->isStatusVerified)
+        {
+            SColor orange = SColorRGBA(230, 200, 180, color.A);
+            m_pServerList[Type]->SetItemColor(iIndex, m_hPlayers[Type], orange.R, orange.G, orange.B, orange.A);
+        }
+
         // If the index was modified from the original, then update all indexes because it means there was some sort
         if (pServer->iRowIndex != iIndex)
             UpdateRowIndexMembers(Type);

Client/core/ServerBrowser/CServerInfo.cpp

@@ -469,13 +469,15 @@ void CServerInfo::Connect()
 
 void CServerInfo::ResetServerGUI(CServerListItem* pServer)
 {
+    const SString strVerified = pServer->isStatusVerified ? "" : "*";
+
     // Set our GUI elements to display the server information
     m_pServerNameLabel->SetText(pServer->strName.c_str());
     m_pServerAddressLabel->SetText(pServer->strEndpoint.c_str());
     m_pGamemodeLabel->SetText(pServer->strGameMode.c_str());
     m_pMapLabel->SetText(pServer->strMap.c_str());
-    m_pPlayersLabel->SetText(SString("%i/%i", pServer->nPlayers, pServer->nMaxPlayers).c_str());
-
+    m_pPlayersLabel->SetText(SString("%d / %d %s", pServer->nPlayers, pServer->nMaxPlayers, *strVerified).c_str());
+    
     m_pPasswordedLabel->SetText(pServer->bPassworded ? _("Yes") : _("No"));
     m_pLatencyLabel->SetText(SString("%i", pServer->nPing));
 

Client/core/ServerBrowser/CServerList.cpp

@@ -514,6 +514,7 @@ bool CServerListItem::ParseQuery()
     if ((uiMasterServerSaysRestrictions & RESTRICTION_PLAYER_LIST) == false)
         vecPlayers = info.playersPool;
 
+    isStatusVerified = info.isStatusVerified;
     bScanned = true;
 
     PostChange();

Client/core/ServerBrowser/CServerList.h

@@ -139,6 +139,7 @@ class CServerListItem
         bScanned = false;
         bSkipped = false;
         bSerials = false;
+        isStatusVerified = true;
         bPassworded = false;
         bKeepFlag = false;
         iRowIndex = -1;
@@ -182,6 +183,7 @@ class CServerListItem
     unsigned short nPlayers;               // Current players
     unsigned short nMaxPlayers;            // Maximum players
     unsigned short nPing;                  // Ping time
+    bool           isStatusVerified;       // Ping status verified
     bool           bPassworded;            // Password protected
     bool           bSerials;               // Serial verification on
     bool           bScanned;

Client/sdk/net/CNet.h

@@ -115,7 +115,7 @@ class CNet
 
     virtual const char* GetNextBuffer() = 0;
     virtual const char* GetDiagnosticStatus() = 0;
-    virtual void        UpdatePingStatus(const char* szStatus, ushort& usDataRef) = 0;
+    virtual void        UpdatePingStatus(const char* szStatus, ushort& usDataRef, bool& isVerified) = 0;
 
     virtual bool VerifySignature(const char* pData, unsigned long ulSize) = 0;
 

Shared/sdk/version.h

@@ -108,7 +108,7 @@
 
 #define _ASE_VERSION QUOTE_DEFINE(MTASA_VERSION_MAJOR) "." QUOTE_DEFINE(MTASA_VERSION_MINOR)
 #define _NETCODE_VERSION_BRANCH_ID      0x4         // Use 0x1 - 0xF to indicate an incompatible branch is being used (0x0 is reserved, 0x4 is trunk)
-#define _CLIENT_NET_MODULE_VERSION      0x0AE       // (0x000 - 0xfff) Lvl9 wizards only
+#define _CLIENT_NET_MODULE_VERSION      0x0AF       // (0x000 - 0xfff) Lvl9 wizards only
 #define _SERVER_NET_MODULE_VERSION      0x0AB       // (0x000 - 0xfff) Lvl9 wizards only
 #define _NETCODE_VERSION                0x1DA       // (0x000 - 0xfff) Increment when net messages change (pre-release)