- Cleanup our product info and show patch version correctly

Author: x64-dev

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

@@ -7,6 +7,8 @@
 //#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_DISABLE_TEXTURE_FILTERING_AND_AA 1
 
 #define GENERALS_ONLINE_TEMP_FIX_DRAW_ENTIRE_TERRAIN 1

GeneralsMD/Code/GameEngine/Source/Common/version.cpp

@@ -330,7 +330,13 @@ UnicodeString Version::getUnicodeProductTitle() const
 
 UnicodeString Version::getUnicodeProductVersion() const
 {
+#if defined(GENERALS_ONLINE)
+    UnicodeString str;
+	str.format(L"%hs", GENERALS_ONLINE_VERSION_STRING);
+	return str;
+#else
 	return getUnicodeGitVersion();
+#endif
 }
 
 UnicodeString Version::getUnicodeProductAuthor() const

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

@@ -1046,7 +1046,9 @@ void NGMP_OnlineServicesManager::InitSentry()
 
 	sentry_options_set_dsn(options, "https://61750bebd112d279bcc286d617819269@o4509316925554688.ingest.us.sentry.io/4509316927586304");
 	sentry_options_set_database_path(options, strDumpPath.c_str());
-	sentry_options_set_release(options, "generalsonline-client@060526_QFE2");
+
+	std::string strVersionStr = std::format("generalsonline-client@{}", GENERALS_ONLINE_VERSION_STRING);
+	sentry_options_set_release(options, strVersionStr.c_str());
 
 #if defined(USE_TEST_ENV)
 	sentry_options_set_environment(options, "test");

GeneralsMD/Code/Main/WinMain.cpp

@@ -909,21 +909,15 @@ Int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
         // TODO_NGMP: Better solution
 #if defined(GENERALS_ONLINE)
         TheVersion->setVersion(VERSION_MAJOR, VERSION_MINOR, GENERALS_ONLINE_VERSION, GENERALS_ONLINE_NET_VERSION,
-#if !defined(_DEBUG)
-            AsciiString("Generals Online Development Team | GitHub Buildserver"), AsciiString(""),
-#else
-            AsciiString("Generals Online Development Team | Development Test Build"), AsciiString(""),
-#endif
+            AsciiString("Generals Online Development Team"), AsciiString(""),
             AsciiString(__TIME__), AsciiString(__DATE__));
 #else
         TheVersion->setVersion(VERSION_MAJOR, VERSION_MINOR, VERSION_BUILDNUM, VERSION_LOCALBUILDNUM,
             AsciiString(VERSION_BUILDUSER), AsciiString(VERSION_BUILDLOC),
             AsciiString(__TIME__), AsciiString(__DATE__));
 #endif
 
-		TheVersion->setVersion(VERSION_MAJOR, VERSION_MINOR, VERSION_BUILDNUM, VERSION_LOCALBUILDNUM,
-			AsciiString(VERSION_BUILDUSER), AsciiString(VERSION_BUILDLOC),
-			AsciiString(__TIME__), AsciiString(__DATE__));
+
 
 		// TheSuperHackers @refactor The instance mutex now lives in its own class.