Override datapath to save preset properly

Author: Causeless

Source/Entities/SceneLayer.h

@@ -76,6 +76,10 @@ namespace RTE {
 		/// @return Whether this SceneLayer's bitmap data was loaded from a file or not.
 		virtual bool IsLoadedFromDisk() const { return !m_BitmapFile.GetDataPath().empty(); }
 
+		/// Override's this SceneLayer's datapath. Used for saved games
+		/// @param dataPath The new datapath to override this SceneLayer to use.
+		void OverrideDataPath(const std::string& dataPath) { m_BitmapFile.SetDataPath(dataPath); }
+
 		/// Loads previously specified/created data into memory from an existing BITMAP. Has to be done before using this SceneLayer if the bitmap was not generated at runtime.
 		/// @param bitmap Pointer to the bitmap to take. Takes ownership!
 		/// @return An error return value signaling success or any particular failure. Anything below 0 is an error signal.

Source/Managers/ActivityMan.cpp

@@ -100,6 +100,10 @@ bool ActivityMan::SaveCurrentGame(const std::string& fileName) {
 	modifiableScene->GetTerrain()->SetPresetName(fileName);
 	modifiableScene->GetTerrain()->MigrateToModule(g_PresetMan.GetModuleID(c_UserScriptedSavesModuleName));
 
+	modifiableScene->GetTerrain()->OverrideDataPath("Save Mat.png");
+	modifiableScene->GetTerrain()->GetFGSceneLayer()->OverrideDataPath("Save FG.png");
+	modifiableScene->GetTerrain()->GetBGSceneLayer()->OverrideDataPath("Save BG.png");
+
 	std::unique_ptr<std::stringstream> iniStream = std::make_unique<std::stringstream>();
 
 	// Block the main thread for a bit to let the Writer access the relevant data.