- Better defaults for dev builds for external devs

Author: x64-dev

Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp

@@ -1519,13 +1519,6 @@ void ConnectionManager::updateRunAhead(Int oldRunAhead, Int frameRate, Bool didS
 			// We also limit the upper range of the runahead to prevent it getting out of hand
 			Int minRunAheadForClamp = MIN_RUNAHEAD;
 
-#if defined(GENERALS_ONLINE)
-			if (TheNGMPGame != nullptr)
-			{
-				minRunAheadForClamp = 4;
-			}
-#endif
-
 			newRunAhead = clamp<Int>(minRunAheadForClamp, newRunAhead, MAX_FRAMES_AHEAD / 2);
 
 			NetRunAheadCommandMsg* msg = newInstance(NetRunAheadCommandMsg);

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

@@ -4,12 +4,12 @@
 #define GENERALS_ONLINE
 #endif
 
-#define GENERALS_ONLINE_USE_PLUGINS_INTERFACE
+//#define GENERALS_ONLINE_USE_PLUGINS_INTERFACE
 
 //#define USE_MAULLER_ONEDRIVE_FIX 1
 //#define USE_STUBBJAX_TRANSPORT_CONTAIN_FIX 1
 
-#define GENERALS_ONLINE_VERSION_STRING "060526_QFE2" // NOTE: Format is critical here for Sentry to work
+#define GENERALS_ONLINE_VERSION_STRING "062026" // NOTE: Format is critical here for Sentry to work
 
 #define GENERALS_ONLINE_DISABLE_TEXTURE_FILTERING_AND_AA 1
 

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

@@ -596,7 +596,7 @@ class NGMP_OnlineServicesManager
 	std::queue<int64_t> m_vecFilesSizes;
 	std::vector<std::string> m_vecFilesDownloaded;
 	std::function<void(void)> m_updateCompleteCallback = nullptr;
-	mutable std::mutex m_updateCallbackMutex;
+	mutable std::recursive_mutex m_updateCallbackMutex;
 
 	std::string m_patcher_name;
 	std::string m_patcher_path;

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

@@ -524,7 +524,7 @@ void NGMP_OnlineServicesManager::ContinueUpdate()
 			TheDownloadManager->OnStatusUpdate(DOWNLOADSTATUS_FINISHING);
 		}
 
-		std::scoped_lock<std::mutex> lock(m_updateCallbackMutex);
+		std::scoped_lock<std::recursive_mutex> lock(m_updateCallbackMutex);
 		if (m_updateCompleteCallback != nullptr)
 		{
 			m_updateCompleteCallback();
@@ -797,7 +797,7 @@ void NGMP_OnlineServicesManager::StartDownloadUpdate(std::function<void(void)> c
 	m_vecFilesSizes.emplace(m_patcher_size);
 
 	{
-		std::scoped_lock<std::mutex> lock(m_updateCallbackMutex);
+		std::scoped_lock<std::recursive_mutex> lock(m_updateCallbackMutex);
 		m_updateCompleteCallback = cb;
 	}