My diff is a clusterfuck and I have a stack overflow AAAAAAAAAAAAAAAAAAAAAAAAAAAA

Author: MaximDude

Managers/ModuleMan.cpp

@@ -211,13 +211,6 @@ namespace RTE {
 	}
 
 
-
-
-
-
-
-
-
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void ModuleMan::LoadOfficialModules() {
@@ -231,7 +224,7 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	bool ModuleMan::LoadAllDataModules() {
-		// Destroy any possible loaded modules
+		// Destroy any possible loaded modules.
 		Destroy();
 
 		LoadOfficialModules();

Managers/ModuleMan.h

@@ -42,11 +42,7 @@ namespace RTE {
 		/// Gets the total number of modules loaded so far, official or not.
 		/// </summary>
 		/// <returns>The number of modules loaded so far, both official and non.</returns>
-		size_t GetTotalModuleCount() const { return m_LoadedDataModules.size(); }
-
-
-
-
+		int GetTotalModuleCount() const { return m_LoadedDataModules.size(); }
 
 
 
@@ -101,8 +97,7 @@ namespace RTE {
 		/// </summary>
 		/// <param name="whichModule">The ID of the module to get.</param>
 		/// <returns>The requested DataModule. Ownership is NOT transferred!</returns>
-		const DataModule * GetDataModule(int whichModule = 0);
-
+		DataModule * GetDataModule(int whichModule = 0);
 
 
 
@@ -150,18 +145,6 @@ namespace RTE {
 		/// <returns>The complete path to the file, including Data/, Userdata/ or Mods/ based on whether or not it's part of an official module or userdata.</returns>
 		std::string GetFullModulePath(const std::string &modulePath) const;
 
-
-
-
-
-
-
-
-
-
-
-
-
 #pragma endregion
 
 #pragma region Contrete Methods
@@ -196,9 +179,8 @@ namespace RTE {
 
 #pragma region Module Loading Breakdown
 		/// <summary>
-		///
+		/// Loads all the official DataModules individually with LoadDataModule.
 		/// </summary>
-		/// <returns></returns>
 		void LoadOfficialModules();
 
 		/// <summary>

Managers/PresetMan.cpp

@@ -19,10 +19,8 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	void PresetMan::RegisterGroup(const std::string &newGroup, int whichModule) {
-		RTEAssert(whichModule >= 0 && whichModule < g_ModuleMan.GetTotalModuleCount(), "Tried to access an out of bounds data module number!");
-
-		g_ModuleMan.GetLoadedDataModules()[whichModule]->RegisterGroup(newGroup);
+	void PresetMan::RegisterGroup(const std::string &newGroup, int whichModule) const {
+		g_ModuleMan.GetDataModule(whichModule)->RegisterGroup(newGroup);
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Managers/PresetMan.h

@@ -40,7 +40,7 @@ namespace RTE {
 		/// </summary>
 		/// <param name="groupName">The group to register.</param>
 		/// <param name="whichModule">The ID of the module in which at least one Entity of this group can be found.</param>
-		void RegisterGroup(const std::string &groupName, int whichModule);
+		void RegisterGroup(const std::string &groupName, int whichModule) const;
 
 		/// <summary>
 		/// Fills out a list with all groups registered in a specific module.