Only write Description for original presets in Entity::Save

Misc changes to editor save error messages

Author: MaximDude

Activities/AreaEditor.cpp

@@ -617,7 +617,7 @@ bool AreaEditor::SaveScene(const std::string &saveAsName, bool forceOverwrite) {
 
 	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!!!");
+			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);
@@ -632,7 +632,7 @@ bool AreaEditor::SaveScene(const std::string &saveAsName, bool forceOverwrite) {
 				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!");
+					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();
@@ -643,7 +643,7 @@ bool AreaEditor::SaveScene(const std::string &saveAsName, bool forceOverwrite) {
 						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!");
+							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");

Activities/AssemblyEditor.cpp

@@ -632,7 +632,7 @@ bool AssemblyEditor::SaveAssembly(const std::string &saveAsName, bool forceOverw
 
 	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!!!");
+			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());
@@ -646,7 +646,7 @@ bool AssemblyEditor::SaveAssembly(const std::string &saveAsName, bool forceOverw
 				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!");
+					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();
@@ -657,7 +657,7 @@ bool AssemblyEditor::SaveAssembly(const std::string &saveAsName, bool forceOverw
 						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!");
+							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");

Activities/SceneEditor.cpp

@@ -670,7 +670,7 @@ bool SceneEditor::SaveScene(const std::string &saveAsName, bool forceOverwrite)
 
 	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!!!");
+			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);
@@ -685,7 +685,7 @@ bool SceneEditor::SaveScene(const std::string &saveAsName, bool forceOverwrite)
 				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!");
+					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();
@@ -696,7 +696,7 @@ bool SceneEditor::SaveScene(const std::string &saveAsName, bool forceOverwrite)
 						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!");
+							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");

System/Entity.cpp

@@ -102,11 +102,14 @@ namespace RTE {
 		// Is an original preset definition
 		if (m_IsOriginalPreset) {
 			writer.NewPropertyWithValue("PresetName", m_PresetName);
+
+			if (!m_PresetDescription.empty()) {
+				writer.NewPropertyWithValue("Description", m_PresetDescription);
+			}
 		// Only write out a copy reference if there is one
 		} else if (!m_PresetName.empty() && m_PresetName != "None") {
 			writer.NewPropertyWithValue("CopyOf", GetModuleAndPresetName());
 		}
-		if (!m_PresetDescription.empty()) { writer.NewPropertyWithValue("Description", m_PresetDescription); }
 
 		// TODO: Make proper save system that knows not to save redundant data!
 		/*