Latency calc logic moved to service config

Author: x64-dev

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

@@ -266,7 +266,9 @@ struct ServiceConfig
 	bool network_do_immediate_flush_per_frame = true;
 	int network_send_flags = -1;
 
-	NLOHMANN_DEFINE_TYPE_INTRUSIVE(ServiceConfig, retry_signalling, use_mapped_port, min_run_ahead_frames, ra_update_frequency_frames, relay_all_traffic, ra_slack_percent, frame_grouping_frames, enable_host_migration, network_do_immediate_flush_per_frame, network_send_flags)
+	int network_latency_logic_model = 0;
+	
+	NLOHMANN_DEFINE_TYPE_INTRUSIVE(ServiceConfig, retry_signalling, use_mapped_port, min_run_ahead_frames, ra_update_frequency_frames, relay_all_traffic, ra_slack_percent, frame_grouping_frames, enable_host_migration, network_do_immediate_flush_per_frame, network_send_flags, network_latency_logic_model)
 };
 
 class NGMP_OnlineServicesManager
@@ -431,6 +433,10 @@ class NGMP_OnlineServicesManager
 	static void CaptureScreenshotToDisk();
 	static void CaptureScreenshotForProbe(EScreenshotType screenshotType);
 
+	static bool g_bAdvancedNetworkStats;
+	static void ToggleAdvancedNetworkStats() { g_bAdvancedNetworkStats = !g_bAdvancedNetworkStats; }
+	static bool IsAdvancedNetworkStatsEnabled() { return g_bAdvancedNetworkStats; }
+
 	/*
 	NGMP_OnlineServices_AuthInterface* GetAuthInterface() const { return m_pAuthInterface; }
 	NGMP_OnlineServices_LobbyInterface* GetLobbyInterface() const { return m_pLobbyInterface; }

GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp

@@ -1380,38 +1380,56 @@ void ConnectionManager::updateRunAhead(Int oldRunAhead, Int frameRate, Bool didS
 	}
 }
 
-Real ConnectionManager::getMaximumLatency() {
-#if defined(GENERALS_ONLINE)
-	Real Maxlat = 0.0f;
+Real ConnectionManager::getMaximumLatency()
+{
+	ServiceConfig& serviceConf = NGMP_OnlineServicesManager::GetInstance()->GetServiceConfig();
+	int latencyLogicModel = serviceConf.network_latency_logic_model;
+	// 0 = original
+	// 1 = pick highest between original and Valve latency (current)
+	// 2 = pick highest between original and Valve latency (historic)
+
+	Real maxLatency = 0.0f;
 
 	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (isPlayerConnected(i) && m_latencyAverages[i] > Maxlat) {
-			Maxlat = m_latencyAverages[i];
+		if (isPlayerConnected(i) && m_latencyAverages[i] > maxLatency) {
+			maxLatency = m_latencyAverages[i];
 		}
 	}
 
-	// TheSuperHackers @info the latencyAverage is the roundtrip latency
-	return Maxlat;
-#else
-	// This works for 2 player games because the latency for the packet router is always 0.
-	Real lat1 = 0.0;
-	Real lat2 = 0.0;
 
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (isPlayerConnected(i)) {
-			if (m_latencyAverages[i] != 0.0) {
-				if (m_latencyAverages[i] > lat1) {
-					lat2 = lat1;
-					lat1 = m_latencyAverages[i];
-				} else if (m_latencyAverages[i] > lat2) {
-					lat2 = m_latencyAverages[i];
-				}
-			}
+	if (latencyLogicModel == 0)
+	{
+		return maxLatency;
+	}
+	else if (latencyLogicModel == 1)
+	{
+		NetworkMesh* pMesh = NGMP_OnlineServicesManager::GetNetworkMesh();
+
+		if (pMesh != nullptr)
+		{
+			Real maxGOLatency = (pMesh->getMaximumLatency() / 1000.f);
+			return maxLatency > maxGOLatency ? maxLatency : maxGOLatency;
+		}
+		else
+		{
+			return maxLatency;
+		}
+	}
+	else if (latencyLogicModel == 2)
+	{
+		NetworkMesh* pMesh = NGMP_OnlineServicesManager::GetNetworkMesh();
+		if (pMesh != nullptr)
+		{
+			Real maxGOLatency = (pMesh->getMaximumHistoricalLatency() / 1000.f);
+			return maxLatency > maxGOLatency ? maxLatency : maxGOLatency;
+		}
+		else
+		{
+			return maxLatency;
 		}
 	}
 
-	return (lat1 + lat2);
-#endif
+	return maxLatency;
 }
 
 void ConnectionManager::getMinimumFps(Int &minFps, Int &minFpsPlayer) {