Use DataModuleType instead of separate params in ModuleMan::LoadDataModule (followup to 895556c)

Author: MaximDude

Managers/ModuleMan.cpp

@@ -164,7 +164,7 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	bool ModuleMan::LoadDataModule(const std::string &moduleName, bool official, bool userdata, const ProgressCallback &progressCallback) {
+	bool ModuleMan::LoadDataModule(const std::string &moduleName, DataModule::DataModuleType moduleType, const ProgressCallback &progressCallback) {
 		if (moduleName.empty()) {
 			return false;
 		}
@@ -225,7 +225,7 @@ namespace RTE {
 
 	void ModuleMan::LoadOfficialModules() {
 		for (const std::string &officialModule : c_OfficialModules) {
-			if (!LoadDataModule(officialModule, true, false, LoadingScreen::LoadingSplashProgressReport)) {
+			if (!LoadDataModule(officialModule, DataModule::DataModuleType::Official, LoadingScreen::LoadingSplashProgressReport)) {
 				RTEAbort("Failed to load official DataModule \"" + officialModule + "\"!");
 			}
 		}
@@ -241,7 +241,7 @@ namespace RTE {
 
 		// If a single module is specified, skip loading all other unofficial modules and load specified module only.
 		if (!m_SingleModuleToLoad.empty() && !IsModuleOfficial(m_SingleModuleToLoad)) {
-			if (!LoadDataModule(m_SingleModuleToLoad, false, false, LoadingScreen::LoadingSplashProgressReport)) {
+			if (!LoadDataModule(m_SingleModuleToLoad, DataModule::DataModuleType::Unofficial, LoadingScreen::LoadingSplashProgressReport)) {
 				g_ConsoleMan.PrintString("ERROR: Failed to load DataModule \"" + m_SingleModuleToLoad + "\"! Only official modules were loaded!");
 				return false;
 			}

Managers/ModuleMan.h

@@ -175,11 +175,10 @@ namespace RTE {
 		/// Reads an entire DataModule and adds it to this. NOTE that official modules can't be loaded after any non-official ones!
 		/// </summary>
 		/// <param name="moduleName">The module name to read, e.g. "Base.rte".</param>
-		/// <param name="official">Whether this module is 'official' or third party. If official, it has to not have any name conflicts with any other official module.</param>
-		/// <param name="userdata">Whether this module is a userdata module. If true, will be treated as an unofficial module.
+		/// <param name="moduleType">The type of module that is being read. See DataModule::DataModuleType enumeration.</param>
 		/// <param name="progressCallback">A function pointer to a function that will be called and sent a string with information about the progress of this DataModule's creation.</param>
 		/// <returns>Whether the DataModule was read and added correctly.</returns>
-		bool LoadDataModule(const std::string &moduleName, bool official, bool userdata = false, const ProgressCallback &progressCallback = nullptr);
+		bool LoadDataModule(const std::string &moduleName, DataModule::DataModuleType moduleType, const ProgressCallback &progressCallback = nullptr);
 
 		/// <summary>
 		/// Loads all the official data modules individually with LoadDataModule, then proceeds to look for any non-official modules and loads them as well.