Misc organization

Author: MaximDude

Managers/ModuleMan.cpp

@@ -30,6 +30,16 @@ namespace RTE {
 		Clear();
 	}
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	bool ModuleMan::IsModuleEnabled(const std::string_view &moduleName) const {
+		return std::none_of(m_DisabledDataModuleNames.begin(), m_DisabledDataModuleNames.end(),
+			[&moduleName](const std::string_view &disabledModuleName) {
+				return disabledModuleName == moduleName;
+			}
+		);
+	}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	bool ModuleMan::IsModuleOfficial(const std::string_view &moduleName) const {
@@ -248,14 +258,4 @@ namespace RTE {
 			}
 		}
 	}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	bool ModuleMan::IsModuleEnabled(const std::string_view &moduleName) const {
-		return std::none_of(m_DisabledDataModuleNames.begin(), m_DisabledDataModuleNames.end(),
-			[&moduleName](const std::string_view &disabledModuleName) {
-				return disabledModuleName == moduleName;
-			}
-		);
-	}
 }

Managers/ModuleMan.h

@@ -44,6 +44,13 @@ namespace RTE {
 		/// <returns>The total number of loaded DataModules.</returns>
 		int GetTotalModuleCount() const { return static_cast<int>(m_LoadedDataModules.size()); }
 
+		/// <summary>
+		/// Gets whether the specified mod is disabled in the settings.
+		/// </summary>
+		/// <param name="moduleName">Mod to check.</param>
+		/// <returns>Whether the module is disabled via settings.</returns>
+		bool IsModuleEnabled(const std::string_view &moduleName) const;
+
 		/// <summary>
 		/// Gets whether a module name is of an official DataModule.
 		/// </summary>
@@ -82,6 +89,12 @@ namespace RTE {
 #pragma endregion
 
 #pragma region DataModule Info Getters
+		/// <summary>
+		/// Gets the DataModule names that are disabled and should not be loaded at startup.
+		/// </summary>
+		/// <returns>Map of mods which are disabled.</returns>
+		std::unordered_set<std::string> & GetDisabledDataModuleNames() { return m_DisabledDataModuleNames; }
+
 		/// <summary>
 		/// Gets the ID of a loaded DataModule.
 		/// </summary>
@@ -118,21 +131,6 @@ namespace RTE {
 		std::string GetFullModulePath(const std::string &modulePath) const;
 #pragma endregion
 
-#pragma region DataModule Management
-		/// <summary>
-		/// Gets the DataModule names that are disabled and should not be loaded at startup.
-		/// </summary>
-		/// <returns>Map of mods which are disabled.</returns>
-		std::unordered_set<std::string> & GetDisabledDataModuleNames() { return m_DisabledDataModuleNames; }
-
-		/// <summary>
-		/// Gets whether the specified mod is disabled in the settings.
-		/// </summary>
-		/// <param name="moduleName">Mod to check.</param>
-		/// <returns>Whether the module is disabled via settings.</returns>
-		bool IsModuleEnabled(const std::string_view &moduleName) const;
-#pragma endregion
-
 #pragma region Contrete Methods
 		/// <summary>
 		/// Reads an entire DataModule and adds it to this. NOTE that official modules can't be loaded after any non-official ones!