- Added debug commands to force relays

- RA changes

Author: x64-dev

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

@@ -105,6 +105,23 @@ class NetworkMesh
 		m_cbOnConnected = nullptr;
 	}
 
+	int getMaximumLatency()
+	{
+		int highestLatency = 0;
+
+		for (auto& kvPair : m_mapConnections)
+		{
+			PlayerConnection& conn = kvPair.second;
+			if (conn.GetLatency() > highestLatency)
+			{
+				highestLatency = conn.GetLatency();
+			}
+		}
+
+		return highestLatency;
+	}
+
+
 	std::queue<QueuedGamePacket> m_queueQueuedGamePackets;
 
 	bool HasGamePacket();

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp

@@ -195,6 +195,26 @@ Bool handleLobbySlashCommands(UnicodeString uText)
 
 		return TRUE; // was a slash command
 	}
+	else if (token == "forcerelay")
+	{
+		extern bool g_bForceRelay;
+		extern UnsignedInt m_exeCRCOriginal;
+		g_bForceRelay = true;
+		m_exeCRCOriginal = TheWritableGlobalData->m_exeCRC;
+		TheWritableGlobalData->m_exeCRC = 123456;
+		GadgetListBoxAddEntryText(listboxLobbyChat, UnicodeString(L"Relays are now forced on. You will only be able to join lobbies where the same option has been set. Use /allowrelay to reset this"), GameMakeColor(255, 0, 0, 255), -1, -1);
+		return TRUE; // was a slash command
+	}
+	else if (token == "allowrelay")
+	{
+		extern bool g_bForceRelay;
+		extern UnsignedInt m_exeCRCOriginal;
+		g_bForceRelay = false;
+		TheWritableGlobalData->m_exeCRC = m_exeCRCOriginal;
+		m_exeCRCOriginal = 0;
+		GadgetListBoxAddEntryText(listboxLobbyChat, UnicodeString(L"Relays are now optional again. You will only be able to join lobbies where the same option has been set. Use /forcerelay to reset this"), GameMakeColor(255, 0, 0, 255), -1, -1);
+		return TRUE; // was a slash command
+	}
 	else if (token == "refresh")
 	{
 		// Added 2/19/03 added the game refresh

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

@@ -1279,10 +1279,30 @@ void ConnectionManager::updateRunAhead(Int oldRunAhead, Int frameRate, Bool didS
 #endif
 
 			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::updateRunAhead - minFps after adjustment is %d", minFps));
-			Int newRunAhead = (Int)((getMaximumLatency() / 2.0) * (Real)minFps);
+			Int newRunAhead = 0;
+			if (TheNGMPGame == nullptr)
+			{
+				newRunAhead = (Int)((getMaximumLatency() / 2.0) * (Real)minFps);
+				NetworkLog(ELogVerbosity::LOG_DEBUG, "New run ahead is %d, formula is maxlat is %f (div 2: %f), minfps is %d", newRunAhead, getMaximumLatency(), getMaximumLatency() / 2.f, minFps);
+			}
+			else
+			{
+				// for NGMP use our data, its more accurate
+				NetworkMesh* pMesh = NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->GetNetworkMesh();
+
+				if (pMesh != nullptr)
+				{
+					float maxLatency = (float)pMesh->getMaximumLatency();
+					newRunAhead = (Int)(maxLatency * (1000.f / TheNetwork->getFrameRate()));
+
+					NetworkLog(ELogVerbosity::LOG_DEBUG, "New run ahead is %d, formula is maxlat is %f, minfps is %d", newRunAhead, maxLatency, minFps);
+				}
+				
+			}
+
 			newRunAhead += (newRunAhead * TheGlobalData->m_networkRunAheadSlack) / 100; // Add in 10% of slack to the run ahead in case of network hiccups.
 
-			NetworkLog(ELogVerbosity::LOG_DEBUG, "New run ahead is %d, formula is maxlat is %f (div 2: %f), minfps is %d", newRunAhead, getMaximumLatency(), getMaximumLatency()/2.f, minFps);
+			
 			if (newRunAhead < MIN_RUNAHEAD) {
 				newRunAhead = MIN_RUNAHEAD; // make sure its at least MIN_RUNAHEAD.
 			}

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

@@ -356,7 +356,7 @@ void NGMPGame::launchGame(void)
 	TheWritableGlobalData->m_showMetrics = true;
 #endif
 
-	TheWritableGlobalData->m_networkRunAheadSlack = 12;
+	TheWritableGlobalData->m_networkRunAheadSlack = 10;
 
 #if defined(GENERALS_ONLINE_HIGH_FPS_RENDER)
 	TheWritableGlobalData->m_horizontalScrollSpeedFactor = NGMP_OnlineServicesManager::Settings.Camera_MoveSpeedRatio();

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

@@ -13,6 +13,9 @@
 #include "ValveNetworkingSockets/steam/isteamnetworkingutils.h"
 #include "ValveNetworkingSockets/steam/steamnetworkingcustomsignaling.h"
 
+bool g_bForceRelay = false;
+UnsignedInt m_exeCRCOriginal = 0;
+
 // Called when a connection undergoes a state transition
 void OnSteamNetConnectionStatusChanged(SteamNetConnectionStatusChangedCallback_t* pInfo)
 {
@@ -436,7 +439,14 @@ NetworkMesh::NetworkMesh()
 	SteamNetworkingUtils()->SetGlobalConfigValueString(k_ESteamNetworkingConfig_P2P_TURN_PassList, NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->GetLobbyTurnToken().c_str());
 
 	// Allow sharing of any kind of ICE address.
-	SteamNetworkingUtils()->SetGlobalConfigValueInt32(k_ESteamNetworkingConfig_P2P_Transport_ICE_Enable, k_nSteamNetworkingConfig_P2P_Transport_ICE_Enable_All);
+	if (g_bForceRelay)
+	{
+		SteamNetworkingUtils()->SetGlobalConfigValueInt32(k_ESteamNetworkingConfig_P2P_Transport_ICE_Enable, k_nSteamNetworkingConfig_P2P_Transport_ICE_Enable_Relay);
+	}
+	else
+	{
+		SteamNetworkingUtils()->SetGlobalConfigValueInt32(k_ESteamNetworkingConfig_P2P_Transport_ICE_Enable, k_nSteamNetworkingConfig_P2P_Transport_ICE_Enable_All);
+	}
 
 	m_hListenSock = k_HSteamListenSocket_Invalid;