Pull version check into private method

Author: MaximDude

System/DataModule.cpp

@@ -54,26 +54,7 @@ namespace RTE {
 		// If the module is a mod, read only its `index.ini` to validate its SupportedGameVersion.
 		if (m_ModuleID >= g_PresetMan.GetOfficialModuleCount() && !m_IsUserdata && ReadModuleProperties(moduleName, progressCallback) >= 0) {
 			if (progressCallback) { progressCallback(m_FileName + " " + static_cast<char>(-43) + " reading index:", true); }
-			if (m_SupportedGameVersion != c_GameVersion) {
-
-				RTEAssert(m_SupportedGameVersion != version::Semver200_version(), m_FileName + " does not specify a supported Cortex Command version, so it is not compatible with this version of Cortex Command (" + c_GameVersion.str() + ").\n\nPlease contact the mod author or ask for help in the CCCP discord server.");
-
-				bool modulePrereleaseVersionMismatch = !m_SupportedGameVersion.prerelease().empty();
-				bool moduleBuildVersionMismatch = !m_SupportedGameVersion.build().empty();
-				RTEAssert(!modulePrereleaseVersionMismatch && !moduleBuildVersionMismatch, m_FileName + " was developed for prerelease build of Cortex Command v" + m_SupportedGameVersion.str() + ", this game version (v" + c_GameVersion.str() + ") is incompatible.\n\nMods developed on a prerelease must match the game version exactly.\nPlease contact the mod author or ask for help in the CCCP discord server.");
-
-				bool gamePrereleaseVersionMismatch = !c_GameVersion.prerelease().empty();
-				bool gameBuildVersionMismatch = !c_GameVersion.build().empty();
-				RTEAssert(!gamePrereleaseVersionMismatch && !gameBuildVersionMismatch, m_FileName + " was developed for Cortex Command v" + m_SupportedGameVersion.str() + ", this prerelease version of the game (v" + c_GameVersion.str() + ") may not support it.\n\nMods must match the game version exactly to use prerelease builds.\nPlease contact the mod author or ask for help in the CCCP discord server.");
-
-
-				// Game engine is the same major version as the Module
-				bool majorVersionMatch = c_GameVersion.major() == m_SupportedGameVersion.major();
-				// Game engine is at least the minor version the Module requires (allow patch mismatch)
-				bool minorVersionInRange = m_SupportedGameVersion.inc_minor() <= c_GameVersion.inc_minor();
-
-				RTEAssert(majorVersionMatch && minorVersionInRange, m_FileName + " was developed for Cortex Command v" + m_SupportedGameVersion.str() + ", so this version of Cortex Command (v" + c_GameVersion.str() + ") may not support it.\nPlease contact the mod author or ask for help in the CCCP discord server.");
-			}
+			CheckSupportedGameVersion();
 		}
 
 		if (reader.Create(indexPath, true, progressCallback) >= 0) {
@@ -505,4 +486,29 @@ namespace RTE {
 		}
 		return true;
 	}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	void DataModule::CheckSupportedGameVersion() const {
+		if (m_SupportedGameVersion != c_GameVersion) {
+			static const std::string contactAuthor = "Please contact the mod author or ask for help in the CCCP discord server.";
+
+			RTEAssert(m_SupportedGameVersion != version::Semver200_version(), m_FileName + " does not specify a supported Cortex Command version, so it is not compatible with this version of Cortex Command (" + c_GameVersion.str() + ").\n\n" + contactAuthor);
+
+			bool modulePrereleaseVersionMismatch = !m_SupportedGameVersion.prerelease().empty();
+			bool moduleBuildVersionMismatch = !m_SupportedGameVersion.build().empty();
+			RTEAssert(!modulePrereleaseVersionMismatch && !moduleBuildVersionMismatch, m_FileName + " was developed for pre-release build of Cortex Command v" + m_SupportedGameVersion.str() + ", this game version (v" + c_GameVersion.str() + ") is incompatible.\n\nMods developed on a pre-release must match the game version exactly.\n" + contactAuthor);
+
+			bool gamePrereleaseVersionMismatch = !c_GameVersion.prerelease().empty();
+			bool gameBuildVersionMismatch = !c_GameVersion.build().empty();
+			RTEAssert(!gamePrereleaseVersionMismatch && !gameBuildVersionMismatch, m_FileName + " was developed for Cortex Command v" + m_SupportedGameVersion.str() + ", this pre-release version of the game (v" + c_GameVersion.str() + ") may not support it.\n\nMods must match the game version exactly to use pre-release builds.\n" + contactAuthor);
+
+			// Game engine is the same major version as the Module
+			bool majorVersionMatch = c_GameVersion.major() == m_SupportedGameVersion.major();
+			// Game engine is at least the minor version the Module requires (allow patch mismatch)
+			bool minorVersionInRange = m_SupportedGameVersion.inc_minor() <= c_GameVersion.inc_minor();
+
+			RTEAssert(majorVersionMatch && minorVersionInRange, m_FileName + " was developed for Cortex Command v" + m_SupportedGameVersion.str() + ", so this version of Cortex Command (v" + c_GameVersion.str() + ") may not support it.\n" + contactAuthor);
+		}
+	}
 }

System/DataModule.h

@@ -356,6 +356,11 @@ namespace RTE {
 		static const std::string c_ClassName; //!< A string with the friendly-formatted type name of this object.
 
 #pragma region INI Handling
+		/// <summary>
+		/// Checks the module's supported game version against the current game version to ensure compatibility.
+		/// </summary>
+		void CheckSupportedGameVersion() const;
+
 		/// <summary>
 		/// If ScanFolderContents is enabled in this DataModule's Index.ini, looks for any ini files in the top-level directory of the module and reads all of them in alphabetical order.
 		/// </summary>