Fix GibEditor failing to save and refactor to save only relevant data

Author: MaximDude

Activities/GibEditor.cpp

@@ -703,93 +703,69 @@ void GibEditor::Draw(BITMAP *pTargetBitmap, const Vector &targetPos)
     EditorActivity::Draw(pTargetBitmap, targetPos);
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:          SaveObject
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Saves the current object to an appropriate ini file, and asks user if
-//                  they want to overwrite first if object of this name exists.
-
-bool GibEditor::SaveObject(std::string saveAsName, bool forceOverwrite)
-{
-    if (!m_pEditedObject)
-        return false;
-
-    // Set the name of the current object in effect
-    m_pEditedObject->SetPresetName(saveAsName);
-
-    // Replace the gibs of the object with the proxies that have been edited in the gui
-    StuffEditedGibs(m_pEditedObject);
+bool GibEditor::SaveObject(const std::string &saveAsName, bool forceOverwrite) {
+	if (!m_pEditedObject) {
+		return false;
+	}
+	m_pEditedObject->SetPresetName(saveAsName);
 
-// TODO: do proper overwriting looking at the files etc
-    // Try to add to the isntance man
-    std::string objectFilePath(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/NewData/" + saveAsName + ".ini");
+	// Replace the gibs of the object with the proxies that have been edited in the GUI.
+	StuffEditedGibs(m_pEditedObject);
 
-	// Check if file exists
-	bool newDataFileExisted = System::PathExistsCaseSensitive(objectFilePath.c_str());
+	std::string dataModuleName = g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName();
+	std::string dataModuleFullPath = g_PresetMan.GetFullModulePath(dataModuleName);
+	std::string newDataDir = dataModuleFullPath + "/NewData";
+	std::string objectSavePath = newDataDir + "/" + saveAsName + ".ini";
 
-	// Try to create NewData directory if file does not exist
-	if (!newDataFileExisted)
-	{
-		System::MakeDirectory(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/NewData");
+	if (!System::PathExistsCaseSensitive(newDataDir) && !System::MakeDirectory(newDataDir)) {
+		RTEError::ShowMessageBox("Failed to create NewData directory in:\n\n" + dataModuleFullPath + "\n\nTHE EDITED OBJECT PRESET WAS NOT SAVED!!!");
+		return false;
 	}
 
-    if (g_PresetMan.AddEntityPreset(m_pEditedObject, m_ModuleSpaceID, forceOverwrite, objectFilePath))
-// TEMP always overwrite for now until proper save system is in place
-//    if (g_PresetMan.AddEntityPreset(m_pEditedObject, m_ModuleSpaceID, true))
-    {
-        // Does ini already exist? If yes, then no need to add it to a objects.ini etc
-        bool objectFileExisted = System::PathExistsCaseSensitive(objectFilePath.c_str());
-        // If the ini file already exists, and then ask if overwrite first
-        if (objectFileExisted && !forceOverwrite)
-        {
-            // Gotto ask if we can overwrite the existing object/file
-            m_PreviousMode = EditorActivity::SAVEDIALOG;
-            m_EditorMode = EditorActivity::OVERWRITEDIALOG;
-            m_ModeChange = true;
-            return false;
-        }
-        // Create the writer
-        Writer objectWriter(objectFilePath.c_str(), false);
-        RTEAssert(objectWriter.WriterOK(), "Couldn't open file " + objectFilePath + "to write to! Check if directory exists..?");
-        objectWriter.NewProperty("AddObject");
-        // Write the object out to the new ini
-        m_pEditedObject->MOSRotating::Save(objectWriter);
-        objectWriter.ObjectEnd();
-        // TODO: Make system for saving into/over the existing definition read originally from the ini's, wherever it was
-        /*
-                if (!objectFileExisted)
-                {
-                    // First find/create  a .rte/Scenes.ini file to include the new .ini into
-                    string objectsFilePath(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes.ini");
-                    bool objectsFileExisted = System::PathExistsCaseSensitive(objectsFilePath.c_str());
-                    Writer objectsWriter(objectsFilePath.c_str(), true);
-                    objectsWriter.NewProperty("\nIncludeFile");
-                    objectsWriter << objectFilePath;
-
-                    // 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 (!objectsFileExisted)
-                    {
-                        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 << objectsFilePath;
-                    }
-                }
-        */
-        return m_HasEverBeenSaved = true;
-    }
-    else
-    {
-        // Gotto ask if we can overwrite the existing object
-        m_PreviousMode = EditorActivity::SAVEDIALOG;
-        m_EditorMode = EditorActivity::OVERWRITEDIALOG;
-        m_ModeChange = true;
-    }
-
-    return false;
+	// Force overwrite the stored preset so we aren't prompted to every time for every preset. This doesn't screw with the original ini because there's no system for that in place
+	// and doesn't actually get loaded on the next game start either, so any changes will be discarded at the end of the current runtime.
+	if (g_PresetMan.AddEntityPreset(m_pEditedObject, m_ModuleSpaceID, true, objectSavePath)) {
+		// Show the overwrite dialog only when actually overwriting a saved ini in NewData or forcing an overwrite.
+		if (!System::PathExistsCaseSensitive(objectSavePath) || forceOverwrite) {
+			if (Writer objectWriter(objectSavePath, false); !objectWriter.WriterOK()) {
+				RTEError::ShowMessageBox("Failed to create Writer to path:\n\n" + objectSavePath + "\n\nTHE EDITED OBJECT PRESET WAS NOT SAVED!!!");
+			} else {
+				std::string addObjectType;
+				switch (m_pEditedObject->GetMOType()) {
+					case MovableObject::MOType::TypeActor:
+						addObjectType = "AddActor";
+						break;
+					case MovableObject::MOType::TypeHeldDevice:
+					case MovableObject::MOType::TypeThrownDevice:
+						addObjectType = "AddDevice";
+						break;
+					default:
+						addObjectType = "AddEffect";
+				}
+				objectWriter.NewProperty(addObjectType);
+				m_pEditedObject->Entity::Save(objectWriter);
+				for (const Gib &gib : *m_pEditedObject->GetGibList()) {
+					objectWriter.NewPropertyWithValue("AddGib", gib);
+				}
+				objectWriter.ObjectEnd();
+				objectWriter.EndWrite();
+
+				m_HasEverBeenSaved = true;
+
+				// TODO: Maybe make system for saving into/over the existing definition read originally from the ini's, wherever it was.
+
+				return true;
+			}
+		} else {
+			// Got to ask if we can overwrite the existing object.
+			m_PreviousMode = EditorMode::SAVEDIALOG;
+			m_EditorMode = EditorMode::OVERWRITEDIALOG;
+			m_ModeChange = true;
+		}
+	}
+	return false;
 }
 
 

Activities/GibEditor.h

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

Entities/Gib.cpp

@@ -77,7 +77,8 @@ namespace RTE {
 		// All of this is needed to make a preset look like not original and save as CopyOf instead of separate preset.
 		std::unique_ptr<Entity> gibEntity(m_GibParticle->Clone());
 		gibEntity->ResetOriginalPresetFlag();
-		writer << gibEntity.get();
+		gibEntity->Entity::Save(writer);
+		writer.ObjectEnd();
 
 		writer.NewProperty("Offset");
 		writer << m_Offset;