Fix AreaEditor failing to save

Copypasta of SceneEditor::SaveScene - very bad, but is what it is until someone deals with it

Author: MaximDude

Activities/AreaEditor.cpp

@@ -594,95 +594,74 @@ void AreaEditor::Draw(BITMAP* pTargetBitmap, const Vector &targetPos)
     EditorActivity::Draw(pTargetBitmap, targetPos);
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:          SaveScene
-//////////////////////////////////////////////////////////////////////////////////////////
-// 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 AreaEditor::SaveScene(const std::string &saveAsName, bool forceOverwrite) {
+	Scene *editedScene = g_SceneMan.GetScene();
+	editedScene->SetPresetName(saveAsName);
 
-bool AreaEditor::SaveScene(std::string saveAsName, bool forceOverwrite)
-{
-    // Set the name of the current scene in effect
-    g_SceneMan.GetScene()->SetPresetName(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");
-        std::string previewFilePath(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/" + saveAsName + ".preview.png");
-		if (g_PresetMan.AddEntityPreset(g_SceneMan.GetScene(), m_ModuleSpaceID, forceOverwrite, sceneFilePath))
-		{
-			// Save preview
-			g_SceneMan.GetScene()->SavePreview(previewFilePath);
-
-			// 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("AddScene");
-			// Write the scene out to the new ini
-			sceneWriter << g_SceneMan.GetScene();
-			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;
-		}
+	std::string dataModuleFullPath = g_PresetMan.GetFullModulePath(dataModuleName);
+	std::string sceneSavePath;
+	std::string previewSavePath;
+
+	if (savingToUserScenesModule) {
+		sceneSavePath = dataModuleFullPath + "/" + saveAsName + ".ini";
+		previewSavePath = dataModuleFullPath + "/" + saveAsName + ".preview.png";
+	} else {
+		sceneSavePath = dataModuleFullPath + "/Scenes/" + saveAsName + ".ini";
+		previewSavePath = dataModuleFullPath + "/Scenes/" + saveAsName + ".preview.png";
 	}
-	else
-	{
-		// Try to save to the data module
-        std::string sceneFilePath(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes/" + saveAsName + ".ini");
-        std::string previewFilePath(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes/" + saveAsName + ".preview.png");
-		if (g_PresetMan.AddEntityPreset(g_SceneMan.GetScene(), m_ModuleSpaceID, forceOverwrite, sceneFilePath))
-		{
-            // Save preview
-            g_SceneMan.GetScene()->SavePreview(previewFilePath);
-
-            // 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("AddScene");
-            // TODO: Check if the ini file already exists, and then ask if overwrite
-                    // Write the scene out to the new ini
-            sceneWriter << g_SceneMan.GetScene();
-
-            if (!sceneFileExisted)
-            {
-                // First find/create  a .rte/Scenes.ini file to include the new .ini into
-                std::string scenesFilePath(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes.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;
-                }
-            }
-			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;
+
+	if (g_PresetMan.AddEntityPreset(editedScene, m_ModuleSpaceID, forceOverwrite, sceneSavePath)) {
+		if (Writer sceneWriter(sceneSavePath, false); !sceneWriter.WriterOK()) {
+			RTEError::ShowMessageBox("Failed to create Writer to path:\n\n" + sceneSavePath + "!\n\nTHE EDITED SCENE PRESET WAS NOT SAVED!!!");
+		} else {
+			// TODO: Check if the ini file already exists, and then ask if overwrite.
+			sceneWriter.NewPropertyWithValue("AddScene", editedScene);
+			sceneWriter.EndWrite();
+
+			editedScene->SavePreview(previewSavePath);
+			m_HasEverBeenSaved = true;
+
+			if (!savingToUserScenesModule) {
+				// First find/create a Scenes.ini file to include the new .ini into.
+				std::string scenesFilePath(dataModuleFullPath + "/Scenes.ini");
+				bool scenesFileExists = System::PathExistsCaseSensitive(scenesFilePath);
+
+				if (Writer scenesFileWriter(scenesFilePath, true); !scenesFileWriter.WriterOK()) {
+					RTEError::ShowMessageBox("Failed to create Writer to path:\n\n" + scenesFilePath + "!\n\nThe edited Scene preset was saved but will not be loaded on next game start!\nPlease include the Scene preset manually!");
+				} else {
+					scenesFileWriter.NewPropertyWithValue("IncludeFile", sceneSavePath);
+					scenesFileWriter.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 (!scenesFileExists) {
+						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 << scenesFilePath;
+							indexWriter.EndWrite();
+						}
+					}
+				}
+			}
+			return true;
 		}
+	} else {
+		// Got to ask if we can overwrite the existing preset.
+		m_PreviousMode = EditorMode::SAVEDIALOG;
+		m_EditorMode = EditorMode::OVERWRITEDIALOG;
+		m_ModeChange = true;
 	}
-
-    return false;
+	return false;
 }
 
 

Activities/AreaEditor.h

@@ -208,19 +208,13 @@ ClassInfoGetters;
 
 protected:
 
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:          SaveScene
-//////////////////////////////////////////////////////////////////////////////////////////
-// 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.
-// 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 SaveScene(std::string saveAsName, bool forceOverwrite = false);
+	/// <summary>
+	/// Saves the current Scene to an appropriate ini file, and asks user if they want to overwrite first if scene of this name exists.
+	/// </summary>
+	/// <param name="saveAsName">The name of the new Scene to be saved.</param>
+	/// <param name="forceOverwrite">Whether to force any existing Scene of that name to be overwritten if it already exists.</param>
+	/// <returns>Whether actually managed to save. Will return false both if a scene of this name already exists, or if other error.</returns>
+	bool SaveScene(const std::string &saveAsName, bool forceOverwrite = false);
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -281,7 +275,7 @@ ClassInfoGetters;
 
     // The textbox for entering new Area names
     GUITextBox *m_pNewAreaName;
-//    // Number which  
+//    // Number which
 //    int m_NewAreaNumber;