Map transfer works again

Author: x64-dev

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

@@ -585,7 +585,11 @@ void NGMP_OnlineServices_LobbyInterface::UpdateRoomDataCache(std::function<void(
 				}
 				else
 				{
-					lobbyEntry.map_path = std::format("{}\\{}", TheMapCache->getUserMapDir(true).str(), lobbyEntry.map_path.c_str());
+					// TODO_NGMP: This needs to match identically, but why did it change from the base game?
+					AsciiString strUserMapDIr = TheMapCache->getUserMapDir(true);
+					strUserMapDIr.toLower();
+
+					lobbyEntry.map_path = std::format("{}\\{}", strUserMapDIr.str(), lobbyEntry.map_path.c_str());
 				}
 
 				// did the map change? cache that we need to reset and transmit our ready state

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

@@ -23,6 +23,8 @@ void PortMapper::Tick()
 	// do we have work to do on main thread?
 	if (m_bPortMapperWorkComplete.load())
 	{
+		NetworkLog("[NAT Check]: Port mapper is complete, starting NAT flow");
+
 		m_bPortMapperWorkComplete.store(false);
 
 		// start nat checker
@@ -100,6 +102,7 @@ void PortMapper::Tick()
 
 void PortMapper::StartNATCheck()
 {
+	NetworkLog("[NAT Checker]: Starting");
 	for (int i = 0; i < m_probesExpected; ++i)
 	{
 		m_probesReceived[i] = false;
@@ -159,7 +162,7 @@ void PortMapper::StartNATCheck()
 		return;
 	}
 
-
+	NetworkLog("[NAT Check]: Really starting");
 	// do NAT check
 	m_bNATCheckInProgress = true;
 	m_probeStartTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::utc_clock::now().time_since_epoch()).count();
@@ -190,6 +193,8 @@ void PortMapper::StartNATCheck()
 
 void PortMapper::BackgroundThreadRun()
 {
+	NetworkLog("[PortMapper]: BackgroundThreadRun");
+
 	// reset state
 	m_directConnect = ECapabilityState::UNDETERMINED;
 	m_capUPnP = ECapabilityState::UNDETERMINED;
@@ -209,6 +214,8 @@ void PortMapper::BackgroundThreadRun()
 
 	m_capUPnP = (IGDStatus == 1) ? ECapabilityState::SUPPORTED : ECapabilityState::UNSUPPORTED;
 
+	NetworkLog("[PortMapper]: UPnP result: %d", m_capUPnP);
+
 	// NAT-PMP
 	int res;
 	natpmp_t natpmp;
@@ -230,6 +237,7 @@ void PortMapper::BackgroundThreadRun()
 	closenatpmp(&natpmp);
 
 	m_capNATPMP = (res == NATPMP_RESPTYPE_PUBLICADDRESS) ? ECapabilityState::SUPPORTED : ECapabilityState::UNSUPPORTED;;
+	NetworkLog("[PortMapper]: NAT-PMP result: %d", m_capNATPMP);
 
 	// open ports
 	TryForwardPreferredPorts();
@@ -240,19 +248,23 @@ void PortMapper::BackgroundThreadRun()
 
 void PortMapper::DetermineLocalNetworkCapabilities(std::function<void(void)> callbackDeterminedCaps)
 {
+	NetworkLog("[PortMapper] Start DetermineLocalNetworkCapabilities");
 	// store callback
 	m_callbackDeterminedCaps = callbackDeterminedCaps;
 
 	// reset status
 	m_bPortMapperWorkComplete.store(false);
 
+	NetworkLog("[PortMapper] DetermineLocalNetworkCapabilities - starting background thread");
+
 	// background thread, network ops are blocking
 	m_backgroundThread = new std::thread(&PortMapper::BackgroundThreadRun, this);
 	SetThreadDescription(static_cast<HANDLE>(m_backgroundThread->native_handle()), L"PortMapper Background Thread");
 }
 
 void PortMapper::TryForwardPreferredPorts()
 {
+	NetworkLog("[PortMapper]: TryForwardPreferredPorts");
 	// clean up anything we had, might be a re-enter
 	CleanupPorts();
 

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp

@@ -1923,7 +1923,7 @@ void W3DView::setDefaultView(Real pitch, Real angle, Real maxHeight)
 	// TODO_NGMP: Better way of doing this
 #if defined(GENERALS_ONLINE)
 	TheWritableGlobalData->m_minCameraHeight = 100.f;
-	TheWritableGlobalData->m_maxCameraHeight = 800.f;
+	TheWritableGlobalData->m_maxCameraHeight = 650.f;
 	m_minHeightAboveGround = 100.f;
 	m_maxHeightAboveGround = 600.f;