Don't care about official module count - container is unsorted, just check the module's type

Author: MaximDude

Lua/LuaBindingsManagers.cpp

@@ -112,7 +112,6 @@ namespace RTE {
 		.def("GetModuleID", &ModuleMan::GetModuleID)
 		.def("GetModuleIDFromPath", &ModuleMan::GetModuleIDFromPath)
 		.def("GetTotalModuleCount", &ModuleMan::GetTotalModuleCount)
-		.def("GetOfficialModuleCount", &ModuleMan::GetOfficialModuleCount)
 		.def("IsModuleOfficial", &ModuleMan::IsModuleOfficial)
 		.def("IsModuleUserdata", &ModuleMan::IsModuleUserdata)
 		.def("GetFullModulePath", &ModuleMan::GetFullModulePath);

Managers/ModuleMan.cpp

@@ -23,8 +23,6 @@ namespace RTE {
 
 	void ModuleMan::Clear() {
 		m_LoadedDataModules.clear();
-		m_OfficialModuleCount = 0;
-
 		m_DisabledMods.clear();
 	}
 
@@ -262,11 +260,8 @@ namespace RTE {
 				if (std::regex_match(directoryEntryPath, std::regex(".*\.rte"))) {
 					std::string moduleName = directoryEntryPath.substr(directoryEntryPath.find_last_of('/') + 1, std::string::npos);
 					if (!g_ModuleMan.IsModDisabled(moduleName) && !IsModuleOfficial(moduleName) && !IsModuleUserdata(moduleName)) {
-						int moduleID = GetModuleID(moduleName);
 						// NOTE: LoadDataModule can return false (especially since it may try to load already loaded modules, which is okay) and shouldn't cause stop, so we can ignore its return value here.
-						if (moduleID < 0 || moduleID >= GetOfficialModuleCount()) {
-							LoadDataModule(moduleName, false, false, LoadingScreen::LoadingSplashProgressReport);
-						}
+						LoadDataModule(moduleName, DataModule::DataModuleType::Unofficial, LoadingScreen::LoadingSplashProgressReport);
 					}
 				}
 			}

Managers/ModuleMan.h

@@ -38,12 +38,6 @@ namespace RTE {
 		/// <param name="moduleName">Name of the module to load.</param>
 		void SetSingleModuleToLoad(const std::string_view &moduleName) { m_SingleModuleToLoad = moduleName; }
 
-		/// <summary>
-		/// Gets the total number of OFFICIAL modules loaded so far.
-		/// </summary>
-		/// <returns>The number of official modules loaded so far.</returns>
-		size_t GetOfficialModuleCount() const { return m_OfficialModuleCount; }
-
 		/// <summary>
 		/// Gets the total number of modules loaded so far, official or not.
 		/// </summary>
@@ -194,12 +188,6 @@ namespace RTE {
 		static const std::array<std::string, 10> c_OfficialModules; //!< Array storing the names of all the official modules.
 		static const std::array<std::pair<std::string, std::string>, 3> c_UserdataModules; //!< Array storing the names of all the userdata modules.
 
-
-		/// <summary>
-		/// How many modules are 'official' and shipped with the game, and guaranteed to not have name conflicts among them.
-		/// All official modules are in the beginning of the m_TypeMap, so this count shows how many into that vector they represent
-		/// </summary>
-		int m_OfficialModuleCount;
 		std::unordered_map<int, DataModule *> m_LoadedDataModules; //!< Map of all loaded DataModules by their ID. Owned by this.
 
 		std::string m_SingleModuleToLoad; //!< Name of the single module to load after the official modules.

Managers/PresetMan.cpp

@@ -462,7 +462,7 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	bool PresetMan::AddMaterialMapping(uint8_t fromID, uint8_t toID, int whichModule) const {
-		RTEAssert(whichModule >= g_ModuleMan.GetOfficialModuleCount() && whichModule < g_ModuleMan.GetTotalModuleCount(), "Tried to make a material mapping in an official or out-of-bounds DataModule!");
+		//RTEAssert(whichModule >= g_ModuleMan.GetOfficialModuleCount() && whichModule < g_ModuleMan.GetTotalModuleCount(), "Tried to make a material mapping in an official or out-of-bounds DataModule!");
 
 		return g_ModuleMan.GetLoadedDataModules()[whichModule]->AddMaterialMapping(fromID, toID);
 	}

Menus/ModManagerGUI.cpp

@@ -56,12 +56,9 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void ModManagerGUI::PopulateKnownModsList() {
-		for (int i = 0; i < g_ModuleMan.GetTotalModuleCount(); ++i) {
-			if (i >= g_ModuleMan.GetOfficialModuleCount() && i < g_ModuleMan.GetTotalModuleCount()) {
-				if (const DataModule *dataModule = g_ModuleMan.GetDataModule(i); dataModule && !dataModule->IsUserdata()) {
-					ModRecord modRecord = { dataModule->GetFileName(), dataModule->GetFriendlyName(), dataModule->GetDescription(), g_ModuleMan.IsModDisabled(dataModule->GetFileName()) };
-					m_KnownMods.emplace_back(modRecord);
-				}
+		for (const auto &[moduleID, dataModule] : g_ModuleMan.GetLoadedDataModules()) {
+			if (!dataModule->IsOfficial() && !dataModule->IsUserdata()) {
+				m_KnownMods.emplace_back(dataModule->GetFileName(), dataModule->GetFriendlyName(), dataModule->GetDescription(), g_ModuleMan.IsModDisabled(dataModule->GetFileName()));
 			}
 		}
 		// Add missing data from disabled mods settings

Menus/ObjectPickerGUI.cpp

@@ -383,10 +383,7 @@ namespace RTE {
 					}
 				}
 			} else {
-				for (int moduleID = 0; moduleID < g_ModuleMan.GetOfficialModuleCount() && moduleID < m_ModuleSpaceID; ++moduleID) {
-					g_PresetMan.GetAllOfGroup(moduleList.at(moduleID), groupListItem->m_Name, m_ShowType, moduleID);
-				}
-				g_PresetMan.GetAllOfGroup(moduleList.at(m_ModuleSpaceID), groupListItem->m_Name, m_ShowType, m_ModuleSpaceID);
+				g_PresetMan.GetAllOfGroupInModuleSpace(moduleList.at(m_ModuleSpaceID), groupListItem->m_Name, m_ShowType, m_ModuleSpaceID);
 			}
 		}