Server list now shows host region, expected latency.

Author: x64-dev

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_LobbyInterface.h

@@ -71,6 +71,10 @@ struct LobbyEntry
 	std::string password;
 
 	std::vector<LobbyMemberEntry> members;
+
+	std::string region;
+
+	int latency;
 };
 
 enum class EJoinLobbyResult

GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp

@@ -76,9 +76,9 @@ enum {
 	COLUMN_LADDER,
 	COLUMN_NUMPLAYERS,
 	COLUMN_PASSWORD,
-	COLUMN_PING,
+	COLUMN_OBSERVER,
   COLUMN_USE_STATS,
-  COLUMN_OBSERVER,
+  COLUMN_PING
 };
 #else
 enum {
@@ -336,6 +336,14 @@ static void gameTooltip(GameWindow* window,
 	UnicodeString gameName;
 	gameName.format(L"%s", from_utf8(lobbyEntry.name).c_str());
 	tooltip.format(TheGameText->fetch("TOOLTIP:GameInfoGameName"), gameName.str());
+
+	UnicodeString region;
+	region.format(L"\n\nRegion: %s", from_utf8(lobbyEntry.region).c_str());
+	tooltip.concat(region);
+
+	UnicodeString latency;
+	latency.format(L"\nLatency: %d (%d frames)\n", lobbyEntry.latency, ConvertMSLatencyToGenToolFrames(lobbyEntry.latency));
+	tooltip.concat(latency);
 #else
 	tooltip.format(TheGameText->fetch("TOOLTIP:GameInfoGameName"), room->getGameName().str());
 #endif
@@ -663,8 +671,7 @@ static Int insertGame(GameWindow* win, LobbyEntry& lobbyInfo, Bool showMap)
 	bool bAllowSpectators = lobbyInfo.allow_observers;
 	bool bTrackStats = lobbyInfo.track_stats;
 
-	// TODO_NGMP
-	int latency = 5;
+	int latency = lobbyInfo.latency;
 
 	// TODO_NGMP: Asian text
 	/*
@@ -799,11 +806,11 @@ static Int insertGame(GameWindow* win, LobbyEntry& lobbyInfo, Bool showMap)
 	}
 	// CLH picking an arbitrary number for our ping display
 	// TODO_NGMP: Better values for this
-	if (ping < 30)
+	if (ping < 250)
 	{
 		GadgetListBoxAddEntryImage(win, pingImages[0], index, COLUMN_PING, width, height);
 	}
-	else if (ping < 70)
+	else if (ping < 500)
 	{
 		GadgetListBoxAddEntryImage(win, pingImages[1], index, COLUMN_PING, width, height);
 	}

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Init.cpp

@@ -881,7 +881,7 @@ void NGMP_OnlineServicesManager::InitSentry()
 
 	sentry_options_set_dsn(options, "https://61750bebd112d279bcc286d617819269@o4509316925554688.ingest.us.sentry.io/4509316927586304");
 	sentry_options_set_database_path(options, strDumpPath.c_str());
-	sentry_options_set_release(options, "generalsonline-client@101525_QFE9");
+	sentry_options_set_release(options, "generalsonline-client@110725");
 
 
 #if _DEBUG

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_LobbyInterface.cpp

@@ -462,12 +462,16 @@ void NGMP_OnlineServices_LobbyInterface::SearchForLobbies(std::function<void()>
 	std::map<std::string, std::string> mapHeaders;
 
 	NGMP_OnlineServicesManager::GetInstance()->GetHTTPManager()->SendGETRequest(strURI.c_str(), EIPProtocolVersion::DONT_CARE, mapHeaders, [=](bool bSuccess, int statusCode, std::string strBody, HTTPRequest* pReq)
-	{
-		// TODO_NGMP: Error handling
-		try
 		{
-			nlohmann::json jsonObject = nlohmann::json::parse(strBody);
+			try
+			{
+				nlohmann::json jsonObject = nlohmann::json::parse(strBody);
+
+				std::vector<int> vecLatencies;
 
+				jsonObject["latencies"].get_to(vecLatencies);
+
+				int latencyIndex = 0;
 			for (const auto& lobbyEntryIter : jsonObject["lobbies"])
 			{
 				LobbyEntry lobbyEntry;
@@ -490,6 +494,19 @@ void NGMP_OnlineServices_LobbyInterface::SearchForLobbies(std::function<void()>
 				lobbyEntryIter["IniCRC"].get_to(lobbyEntry.ini_crc);
 				lobbyEntryIter["MatchID"].get_to(lobbyEntry.match_id);
 				lobbyEntryIter["LobbyType"].get_to(lobbyEntry.lobby_type);
+				lobbyEntryIter["Region"].get_to(lobbyEntry.region);
+
+				// attach latency
+				if (latencyIndex < vecLatencies.size())
+				{
+					lobbyEntry.latency = vecLatencies[latencyIndex];
+				}
+				else
+				{
+					// dummy value
+					lobbyEntry.latency = 9001;
+				}
+				++latencyIndex;
 
 				// correct map path
 				if (lobbyEntry.map_official)
@@ -722,6 +739,7 @@ void NGMP_OnlineServices_LobbyInterface::UpdateRoomDataCache(std::function<void(
 						lobbyEntryIter["IniCRC"].get_to(lobbyEntry.ini_crc);
 						lobbyEntryIter["MatchID"].get_to(lobbyEntry.match_id);
 						lobbyEntryIter["LobbyType"].get_to(lobbyEntry.lobby_type);
+						lobbyEntryIter["Region"].get_to(lobbyEntry.region);
 
 						// store, we'll need it later and lobby obj gets destroyed on leave
 						m_CurrentMatchID = lobbyEntry.match_id;