Added verbose logging flag

Author: x64-dev

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

@@ -26,6 +26,8 @@ class GenOnlineSettings
 	bool Graphics_LimitFramerate() const { return m_Render_LimitFramerate; }
 	int Graphics_GetFPSLimit() const { return std::clamp<int>(m_Render_FramerateLimit_FPSVal, 60, 240); }
 
+	bool Debug_VerboseLogging() const { return m_bVerbose; }
+
 	int GetChatLifeSeconds() const { return std::max<int>(m_Chat_LifeSeconds, 10); }
 
 	void Initialize()
@@ -52,6 +54,8 @@ class GenOnlineSettings
 
 	bool m_bInitialized = false;
 
+	bool m_bVerbose = false;
+
 	bool m_Render_DrawStatsOverlay = true;
 	bool m_Render_LimitFramerate = true;
 	int m_Render_FramerateLimit_FPSVal = 60;

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

@@ -19,6 +19,10 @@
 #define SETTINGS_KEY_CHAT "chat"
 #define SETTINGS_KEY_CHAT_LIFE_SECONDS "duration_seconds_until_fade_out"
 
+#define SETTINGS_KEY_DEBUG "debug"
+#define SETTINGS_KEY_DEBUG_VERBOSE_LOGGING "verbose_logging"
+
+
 #define SETTINGS_FILENAME_LEGACY "GeneralsOnline_settings.json"
 #define SETTINGS_FILENAME "settings.json"
 
@@ -156,6 +160,17 @@ void GenOnlineSettings::Load(void)
 				}
 			}
 
+			if (jsonSettings.contains(SETTINGS_KEY_DEBUG))
+			{
+				auto debugSettings = jsonSettings[SETTINGS_KEY_DEBUG];
+
+				if (debugSettings.contains(SETTINGS_KEY_DEBUG_VERBOSE_LOGGING))
+				{
+					m_bVerbose = debugSettings[SETTINGS_KEY_DEBUG_VERBOSE_LOGGING];
+				}
+			}
+
+
 			if (jsonSettings.contains(SETTINGS_KEY_CHAT))
 			{
 				auto chatSettings = jsonSettings[SETTINGS_KEY_CHAT];
@@ -178,6 +193,7 @@ void GenOnlineSettings::Load(void)
 		m_Camera_MinHeight = m_Camera_MinHeight_default;
 		m_Camera_MaxHeight_LobbyHost = m_Camera_MaxHeight_LobbyHost;
 		m_Input_LockCursorToGameWindow = true;
+		m_bVerbose = false;
 		m_Render_LimitFramerate = true;
 		m_Render_FramerateLimit_FPSVal = 60;
 		m_Render_DrawStatsOverlay = true;
@@ -226,7 +242,14 @@ void GenOnlineSettings::Save()
 				{
 					{SETTINGS_KEY_CHAT_LIFE_SECONDS, m_Chat_LifeSeconds}
 				}
-		}
+		},
+
+		{
+			SETTINGS_KEY_DEBUG,
+				{
+					{SETTINGS_KEY_DEBUG_VERBOSE_LOGGING, m_bVerbose},
+				}
+		},
 	};
 
 	std::string strData = root.dump(1);

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

@@ -3,15 +3,19 @@
 #include <mutex>
 #include "libsodium/sodium/crypto_aead_xchacha20poly1305.h"
 #include "libsodium/sodium/randombytes.h"
+#include "../OnlineServices_Init.h"
 
 std::string m_strNetworkLogFileName;
 std::mutex m_logMutex;
 
 void NetworkLog(ELogVerbosity logVerbosity, const char* fmt, ...)
 {
-	if (logVerbosity < g_LogVerbosity)
+	if (!NGMP_OnlineServicesManager::Settings.Debug_VerboseLogging())
 	{
-		return;
+		if (logVerbosity < g_LogVerbosity)
+		{
+			return;
+		}
 	}
 
 	std::scoped_lock scopedLock { m_logMutex };

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

@@ -528,9 +528,8 @@ NetworkMesh::NetworkMesh()
 #if defined(_DEBUG)
 		ESteamNetworkingSocketsDebugOutputType::k_ESteamNetworkingSocketsDebugOutputType_Debug
 #else
-		ESteamNetworkingSocketsDebugOutputType::k_ESteamNetworkingSocketsDebugOutputType_Msg
-#endif
-		;
+		NGMP_OnlineServicesManager::Settings.Debug_VerboseLogging() ? ESteamNetworkingSocketsDebugOutputType::k_ESteamNetworkingSocketsDebugOutputType_Debug : ESteamNetworkingSocketsDebugOutputType::k_ESteamNetworkingSocketsDebugOutputType_Msg
+#endif;
 
 	SteamNetworkingUtils()->SetGlobalConfigValueInt32(k_ESteamNetworkingConfig_LogLevel_P2PRendezvous, logType);
 	SteamNetworkingUtils()->SetDebugOutputFunction(logType, [](ESteamNetworkingSocketsDebugOutputType nType, const char* pszMsg)