Fix AssemblyEditor failing to save

Still pretty much copypasta of SceneEditor::SaveScene

Author: MaximDude

Activities/AssemblyEditor.cpp

@@ -608,107 +608,74 @@ BunkerAssembly * AssemblyEditor::BuildAssembly(std::string saveAsName)
 	return pBA;
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:          SaveAssembly
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Saves the current scene to an appropriate ini file, and asks user if
-//                  they want to overwrite first if scene of this name exists.
+bool AssemblyEditor::SaveAssembly(const std::string &saveAsName, bool forceOverwrite) {
+	std::unique_ptr<BunkerAssembly> editedAssembly(BuildAssembly(saveAsName));
 
-bool AssemblyEditor::SaveAssembly(std::string saveAsName, bool forceOverwrite)
-{
-	BunkerAssembly *pBA = BuildAssembly(saveAsName);
+	std::string dataModuleName = g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName();
+	bool savingToUserScenesModule = (dataModuleName == c_UserScenesModuleName);
 
-	if (g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() == c_UserScenesModuleName)
-	{
-        std::string sceneFilePath(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/" + saveAsName + ".ini");
-		if (g_PresetMan.AddEntityPreset(pBA, m_ModuleSpaceID, forceOverwrite, sceneFilePath))
-		{
-			// Does ini already exist? If yes, then no need to add it to a scenes.ini etc
-			bool sceneFileExisted = System::PathExistsCaseSensitive(sceneFilePath.c_str());
-			// Create the writer
-			Writer sceneWriter(sceneFilePath.c_str(), false);
-			sceneWriter.NewProperty("AddBunkerAssembly");
-			// Write the scene out to the new ini
-			sceneWriter << pBA;
-			delete pBA;
-			pBA = 0;
-			return m_HasEverBeenSaved = true;
-		}
-		else
-		{
-			// Gotto ask if we can overwrite the existing scene
-			m_PreviousMode = EditorActivity::SAVEDIALOG;
-			m_EditorMode = EditorActivity::OVERWRITEDIALOG;
-			m_ModeChange = true;
-		}
-	}
-	else
-	{
-        std::string sceneFilePath;
+	std::string dataModuleFullPath = g_PresetMan.GetFullModulePath(dataModuleName);
+	std::string assemblySavePath;
 
-		// Try to save to the data module
-		if (g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() == "Base.rte")
-			sceneFilePath = g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes/Objects/Bunkers/BunkerAssemblies/" + saveAsName + ".ini";
-		else
-		{
-			sceneFilePath = g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/BunkerAssemblies/" + saveAsName + ".ini";
-			System::MakeDirectory((g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/BunkerAssemblies").c_str());
+	if (savingToUserScenesModule) {
+		assemblySavePath = dataModuleFullPath + "/" + saveAsName + ".ini";
+	} else {
+		if (dataModuleName == "Base.rte") {
+			assemblySavePath = dataModuleFullPath + "/Scenes/Objects/Bunkers/BunkerAssemblies/" + saveAsName + ".ini";
+		} else {
+			System::MakeDirectory((dataModuleFullPath + "/BunkerAssemblies").c_str());
+			assemblySavePath = dataModuleFullPath + "/BunkerAssemblies/" + saveAsName + ".ini";
 		}
+	}
 
-		if (g_PresetMan.AddEntityPreset(pBA, m_ModuleSpaceID, forceOverwrite, sceneFilePath))
-		{
-			// Does ini already exist? If yes, then no need to add it to a scenes.ini etc
-			bool sceneFileExisted = System::PathExistsCaseSensitive(sceneFilePath.c_str());
-			// Create the writer
-			Writer sceneWriter(sceneFilePath.c_str(), false);
-			sceneWriter.NewProperty("AddBunkerAssembly");
-			// Write the scene out to the new ini
-			BunkerAssembly *pBA = BuildAssembly(saveAsName);
-			sceneWriter << pBA;
-			delete pBA;
-			pBA = 0;
-
-			if (!sceneFileExisted)
-			{
-				// First find/create a .rte/Scenes.ini file to include the new .ini into
-                std::string scenesFilePath;
-
-				if (g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() == "Base.rte")
-					scenesFilePath = g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes/Objects/Bunkers/BunkerAssemblies/BunkerAssemblies.ini";
-				else
-					scenesFilePath = g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/BunkerAssemblies/BunkerAssemblies.ini";
-
-				bool scenesFileExisted = System::PathExistsCaseSensitive(scenesFilePath.c_str());
-				Writer scenesWriter(scenesFilePath.c_str(), true);
-				scenesWriter.NewProperty("\nIncludeFile");
-				scenesWriter << sceneFilePath;
-
-				// Also add a line to the end of the modules' Index.ini to include the newly created Scenes.ini next startup
-				// If it's already included, it doens't matter, the definitions will just bounce the second time
-				if (!scenesFileExisted)
-				{
-                    std::string indexFilePath(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Index.ini");
-					Writer indexWriter(indexFilePath.c_str(), true);
-					// Add extra tab since the DataModule has everything indented
-					indexWriter.NewProperty("\tIncludeFile");
-					indexWriter << scenesFilePath;
+	if (g_PresetMan.AddEntityPreset(editedAssembly.get(), m_ModuleSpaceID, forceOverwrite, assemblySavePath)) {
+		if (Writer assemblyWriter(assemblySavePath, false); !assemblyWriter.WriterOK()) {
+			RTEError::ShowMessageBox("Failed to create Writer to path:\n\n" + assemblySavePath + "!\n\nTHE EDITED BUNKER ASSEMBLY PRESET WAS NOT SAVED!!!");
+		} else {
+			// TODO: Check if the ini file already exists, and then ask if overwrite.
+			assemblyWriter.NewPropertyWithValue("AddBunkerAssembly", editedAssembly.get());
+			assemblyWriter.EndWrite();
+
+			m_HasEverBeenSaved = true;
+
+			if (!savingToUserScenesModule) {
+				// First find/create a BunkerAssemblies.ini file to include the new .ini into.
+				std::string assembliesFilePath = dataModuleFullPath + ((dataModuleName == "Base.rte") ? "/Scenes/Objects/Bunkers/BunkerAssemblies/BunkerAssemblies.ini" : "/BunkerAssemblies/BunkerAssemblies.ini");
+				bool assembliesFileExists = System::PathExistsCaseSensitive(assembliesFilePath);
+
+				if (Writer assembliesFileWriter(assembliesFilePath, true); !assembliesFileWriter.WriterOK()) {
+					RTEError::ShowMessageBox("Failed to create Writer to path:\n\n" + assembliesFilePath + "!\n\nThe edited Scene preset was saved but will not be loaded on next game start!\nPlease include the Scene preset manually!");
+				} else {
+					assembliesFileWriter.NewPropertyWithValue("IncludeFile", assemblySavePath);
+					assembliesFileWriter.EndWrite();
+
+					// Append to the end of the modules' Index.ini to include the newly created Scenes.ini next startup.
+					// If it's somehow already included without actually existing, it doesn't matter, the definitions will just bounce the second time.
+					if (!assembliesFileExists) {
+						std::string indexFilePath = dataModuleFullPath + "/Index.ini";
+
+						if (Writer indexWriter(indexFilePath, true); !indexWriter.WriterOK()) {
+							RTEError::ShowMessageBox("Failed to create Writer to path:\n\n" + indexFilePath + "!\n\nThe edited Scene preset was saved but will not be loaded on next game start!\nPlease include the Scene preset manually!");
+						} else {
+							// Add extra tab since the DataModule has everything indented.
+							indexWriter.NewProperty("\tIncludeFile");
+							indexWriter << assembliesFilePath;
+							indexWriter.EndWrite();
+						}
+					}
 				}
 			}
-			return m_HasEverBeenSaved = true;
-		}
-		else
-		{
-			// Gotto ask if we can overwrite the existing scene
-			m_PreviousMode = EditorActivity::SAVEDIALOG;
-			m_EditorMode = EditorActivity::OVERWRITEDIALOG;
-			m_ModeChange = true;
+			return true;
 		}
+	} else {
+		// Got to ask if we can overwrite the existing preset.
+		m_PreviousMode = EditorMode::SAVEDIALOG;
+		m_EditorMode = EditorMode::OVERWRITEDIALOG;
+		m_ModeChange = true;
 	}
-
-	delete pBA;
-	pBA = 0;
-    return false;
+	return false;
 }
 
 

Activities/AssemblyEditor.h

@@ -222,18 +222,13 @@ ClassInfoGetters;
     BunkerAssembly *BuildAssembly(std::string saveAsName);
 
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:          SaveAssembly
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Saves the current assembly to an appropriate ini file, and asks user if
-//                  they want to overwrite first if scene of this name exists.
-// Arguments:       The name of the new scene to be saved.
-//                  Whetehr to force any existing Scene of that name to be overwritten if
-//                  it already exists.
-// Return value:    Whether actually managed to save. Will return false both if a scene
-//                  of this name already exists, or if other error.
-
-    bool SaveAssembly(std::string saveAsName, bool forceOverwrite = false);
+	/// <summary>
+	/// Saves the current BunkerAssembly to an appropriate ini file, and asks user if they want to overwrite first if a BunkerAssembly of this name exists.
+	/// </summary>
+	/// <param name="saveAsName">The name of the new BunkerAssembly to be saved.</param>
+	/// <param name="forceOverwrite">Whether to force any existing BunkerAssembly of that name to be overwritten if it already exists.</param>
+	/// <returns>Whether actually managed to save. Will return false both if a BunkerAssembly of this name already exists, or if other error.</returns>
+	bool SaveAssembly(const std::string &saveAsName, bool forceOverwrite = false);
 
 
 //////////////////////////////////////////////////////////////////////////////////////////