bugfix(network): Revert changes to ConnectionManager::getMaximumLatency() to avoid a higher latency runahead than required (TheSuperHackers#2199)

Author: Mauller

Core/GameEngine/Include/GameNetwork/ConnectionManager.h

@@ -171,7 +171,7 @@ class ConnectionManager
 
 	//	void doPerFrameMetrics(UnsignedInt frame);
 	void getMinimumFps(Int &minFps, Int &minFpsPlayer);			///< Returns the smallest FPS in the m_fpsAverages list.
-	Real getMaximumLatency(); ///< Returns the highest average latency between players.
+	Real getMaximumLatency(); ///< Returns the average of the two highest average latencies between players.
 
 	void requestFrameDataResend(Int playerID, UnsignedInt frame); ///< request of this player that he send the specified frame's data.
 

Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp

@@ -1362,15 +1362,25 @@ void ConnectionManager::updateRunAhead(Int oldRunAhead, Int frameRate, Bool didS
 }
 
 Real ConnectionManager::getMaximumLatency() {
-	Real maxLatency = 0.0f;
+
+	Real lat1 = 0.0f;
+	Real lat2 = 0.0f;
 
 	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (isPlayerConnected(i) && m_latencyAverages[i] > maxLatency) {
-				maxLatency = m_latencyAverages[i];
+		if (isPlayerConnected(i)) {
+			if (m_latencyAverages[i] != 0.0f) {
+				if (m_latencyAverages[i] > lat1) {
+					lat2 = lat1;
+					lat1 = m_latencyAverages[i];
+				}
+				else if (m_latencyAverages[i] > lat2) {
+					lat2 = m_latencyAverages[i];
+				}
+			}
 		}
 	}
 
-	return maxLatency;
+	return (lat1 + lat2) / 2.0f;
 }
 
 void ConnectionManager::getMinimumFps(Int &minFps, Int &minFpsPlayer) {