Removed async savedata on scene, it's no longer necessary

Added helper function to return whether we're currently saving

Author: Causeless

Source/Entities/SLTerrain.cpp

@@ -298,13 +298,13 @@ int SLTerrain::LoadData() {
 	return 0;
 }
 
-int SLTerrain::SaveData(const std::string& pathBase, bool doAsyncSaves) {
+int SLTerrain::SaveData(const std::string& pathBase) {
 	if (pathBase.empty()) {
 		return -1;
 	}
-	SceneLayer::SaveData(pathBase + " Mat.png", doAsyncSaves);
-	m_FGColorLayer->SaveData(pathBase + " FG.png", doAsyncSaves);
-	m_BGColorLayer->SaveData(pathBase + " BG.png", doAsyncSaves);
+	SceneLayer::SaveData(pathBase + " Mat.png");
+	m_FGColorLayer->SaveData(pathBase + " FG.png");
+	m_BGColorLayer->SaveData(pathBase + " BG.png");
 	return 0;
 }
 

Source/Entities/SLTerrain.h

@@ -66,7 +66,7 @@ namespace RTE {
 		/// @param pathBase The filepath base to the where to save the Bitmap data. This means everything up to the extension. "FG" and "Mat" etc will be added.
 		/// @param doAsyncSaves Whether or not to save asynchronously.
 		/// @return An error return value signaling success or any particular failure. Anything below 0 is an error signal.
-		int SaveData(const std::string& pathBase, bool doAsyncSaves = true) override;
+		int SaveData(const std::string& pathBase) override;
 
 		/// Copies bitmap data into layerInfos.
 		/// @param layerInfos List of SceneLayerInfo to emplace our copied data into.

Source/Entities/Scene.cpp

@@ -815,7 +815,7 @@ int Scene::ExpandAIPlanAssemblySchemes() {
 	return 0;
 }
 
-int Scene::SaveData(std::string pathBase, bool doAsyncSaves) {
+int Scene::SaveData(std::string pathBase) {
 	const std::string fullPathBase = g_PresetMan.GetFullModulePath(pathBase);
 	if (fullPathBase.empty())
 		return -1;
@@ -824,7 +824,7 @@ int Scene::SaveData(std::string pathBase, bool doAsyncSaves) {
 		return 0;
 
 	// Save Terrain's data
-	if (m_pTerrain->SaveData(fullPathBase, doAsyncSaves) < 0) {
+	if (m_pTerrain->SaveData(fullPathBase) < 0) {
 		RTEAbort("Saving Terrain " + m_pTerrain->GetPresetName() + "\'s data failed!");
 		return -1;
 	}
@@ -837,7 +837,7 @@ int Scene::SaveData(std::string pathBase, bool doAsyncSaves) {
 		if (m_apUnseenLayer[team]) {
 			std::snprintf(str, sizeof(str), "T%d", team);
 			// Save unseen layer data to disk
-			if (m_apUnseenLayer[team]->SaveData(fullPathBase + " US" + str + ".png", doAsyncSaves) < 0) {
+			if (m_apUnseenLayer[team]->SaveData(fullPathBase + " US" + str + ".png") < 0) {
 				g_ConsoleMan.PrintString("ERROR: Saving unseen layer " + m_apUnseenLayer[team]->GetPresetName() + "\'s data failed!");
 				return -1;
 			}

Source/Entities/Scene.h

@@ -242,10 +242,9 @@ namespace RTE {
 		/// Saves data currently in memory to disk.
 		/// @param pathBase The filepath base to the where to save the Bitmap data. This means
 		/// everything up to the extension. "FG" and "Mat" etc will be added.
-		/// @param doAsyncSaves Whether or not to save asynchronously. (default: true)
 		/// @return An error return value signaling success or any particular failure.
 		/// Anything below 0 is an error signal.
-		int SaveData(std::string pathBase, bool doAsyncSaves = true);
+		int SaveData(std::string pathBase);
 
 		// Gets copied bitmaps of our scene layers, for saving.
 		// @return A list of SceneLayerInfo including our name and a copied bitmap.

Source/Entities/SceneLayer.cpp

@@ -221,7 +221,7 @@ int SceneLayerImpl<TRACK_DRAWINGS, STATIC_TEXTURE>::LoadData() {
 }
 
 template <bool TRACK_DRAWINGS, bool STATIC_TEXTURE>
-int SceneLayerImpl<TRACK_DRAWINGS, STATIC_TEXTURE>::SaveData(const std::string& bitmapPath, bool doAsyncSaves) {
+int SceneLayerImpl<TRACK_DRAWINGS, STATIC_TEXTURE>::SaveData(const std::string& bitmapPath) {
 	if (bitmapPath.empty()) {
 		return -1;
 	}
@@ -231,21 +231,14 @@ int SceneLayerImpl<TRACK_DRAWINGS, STATIC_TEXTURE>::SaveData(const std::string&
 		BITMAP* outputBitmap = create_bitmap_ex(bitmap_color_depth(m_MainBitmap), m_MainBitmap->w, m_MainBitmap->h);
 		blit(m_MainBitmap, outputBitmap, 0, 0, 0, 0, m_MainBitmap->w, m_MainBitmap->h);
 
-		auto saveLayerBitmap = [bitmapPath, doAsyncSaves](BITMAP* bitmapToSave) {
-			PALETTE palette;
-			get_palette(palette);
-			if (save_png(bitmapPath.c_str(), bitmapToSave, palette) != 0) {
-				RTEAbort(std::string("Failed to save SceneLayerImpl bitmap to path and name: " + bitmapPath));
-			}
-			destroy_bitmap(bitmapToSave);
-		};
-
 		m_BitmapFile.SetDataPath(bitmapPath);
-		if (doAsyncSaves) {
-			g_ActivityMan.GetSaveGameTask().push_back(g_ThreadMan.GetBackgroundThreadPool().submit(saveLayerBitmap, outputBitmap));
-		} else {
-			saveLayerBitmap(outputBitmap);
+
+		PALETTE palette;
+		get_palette(palette);
+		if (save_png(bitmapPath.c_str(), outputBitmap, palette) != 0) {
+			RTEAbort(std::string("Failed to save SceneLayerImpl bitmap to path and name: " + bitmapPath));
 		}
+		destroy_bitmap(outputBitmap);
 	}
 	return 0;
 }

Source/Entities/SceneLayer.h

@@ -91,9 +91,8 @@ namespace RTE {
 
 		/// Saves data currently in memory to disk.
 		/// @param bitmapPath The filepath to the where to save the bitmap data.
-		/// @param doAsyncSaves Whether or not to save asynchronously.
 		/// @return An error return value signaling success or any particular failure. Anything below 0 is an error signal.
-		virtual int SaveData(const std::string& bitmapPath, bool doAsyncSaves = true);
+		virtual int SaveData(const std::string& bitmapPath);
 
 		/// Clears out any previously loaded bitmap data from memory.
 		/// @return An error return value signaling success or any particular failure. Anything below 0 is an error signal.

Source/Managers/ActivityMan.cpp

@@ -48,7 +48,7 @@ void ActivityMan::Clear() {
 	m_DefaultActivityName = "Tutorial Mission";
 	m_Activity = nullptr;
 	m_StartActivity = nullptr;
-	m_SaveGameTask = BS::multi_future<void>();
+	m_SaveGameTask = std::future<void>();
 	m_InActivity = false;
 	m_ActivityNeedsRestart = false;
 	m_ActivityNeedsResume = false;
@@ -82,7 +82,7 @@ bool ActivityMan::ForceAbortSave() {
 
 bool ActivityMan::SaveCurrentGame(const std::string& fileName) {
 	m_SaveGameTask.wait();
-	m_SaveGameTask = BS::multi_future<void>();
+	m_SaveGameTask = std::future<void>();
 
 	Scene* scene = g_SceneMan.GetScene();
 	GAScripted* activity = dynamic_cast<GAScripted*>(GetActivity());
@@ -241,7 +241,7 @@ bool ActivityMan::SaveCurrentGame(const std::string& fileName) {
 	};
 
 	// For some reason I can't std::move a unique ptr in, so just releasing and deleting manually...
-	m_SaveGameTask.push_back(g_ThreadMan.GetBackgroundThreadPool().submit(saveWriterData, writer.release()));
+	m_SaveGameTask = g_ThreadMan.GetBackgroundThreadPool().submit(saveWriterData, writer.release());
 
 	// We didn't transfer ownership, so we must be very careful that sceneAltered's deletion doesn't touch the stuff we got from MovableMan.
 	modifiableScene->ClearPlacedObjectSet(Scene::PlacedObjectSets::PLACEONLOAD, false);

Source/Managers/ActivityMan.h

@@ -38,7 +38,7 @@ namespace RTE {
 
 		/// Gets the async save game task.
 		/// @return The savegame task.
-		BS::multi_future<void>& GetSaveGameTask() { return m_SaveGameTask; }
+		std::future<void>& GetSaveGameTask() { return m_SaveGameTask; }
 
 		/// Indicates whether the game is currently running or not (not editing, over or paused).
 		/// @return Whether the game is running or not.
@@ -132,6 +132,10 @@ namespace RTE {
 
 		/// Waits for the task that saves the game to complete.
 		void WaitForSaveGameTask() const { m_SaveGameTask.wait(); }
+
+		/// Returns whether a save is currently in progress.
+		/// @return Whether or not a save is currently in progress.
+		bool IsCurrentlySaving() const { return m_SaveGameTask.wait_for(std::chrono::seconds(0)) == std::future_status::ready; }
 #pragma endregion
 
 #pragma region Activity Start Handling
@@ -198,7 +202,7 @@ namespace RTE {
 		std::unique_ptr<Activity> m_Activity; //!< The currently active Activity.
 		std::unique_ptr<Activity> m_StartActivity; //!< The starting condition of the next Activity to be (re)started.
 
-		BS::multi_future<void> m_SaveGameTask; //!< The current save game task.
+		std::future<void> m_SaveGameTask; //!< The current save game task.
 
 		bool m_InActivity; //!< Whether we are currently in game (as in, not in the main menu or any other out-of-game menus), regardless of its state.
 		bool m_ActivityNeedsRestart; //!< Whether the current Activity needs to be restarted.

Source/Managers/MetaMan.cpp

@@ -319,7 +319,7 @@ int MetaMan::SaveSceneData(std::string pathBase) {
 		// Only save the data of revealed scenes that have already had their layers built and saved into files
 		if ((*sItr)->IsRevealed() && (*sItr)->GetTerrain() && (*sItr)->GetTerrain()->IsLoadedFromDisk()) {
 			// Save the scene data to a good unique prefix for the Scene's layers' bitmap files as they are saved
-			if ((*sItr)->SaveData(pathBase + " - " + (*sItr)->GetPresetName(), false) < 0)
+			if ((*sItr)->SaveData(pathBase + " - " + (*sItr)->GetPresetName()) < 0)
 				return -1;
 		}
 	}

Source/Menus/MetagameGUI.cpp

@@ -2592,7 +2592,7 @@ void MetagameGUI::CompletedActivity() {
 			// However, don't suck up actors of any non-winning team, and don't save the brains if we autoresolved, because that took care of placing the resident brains already
 			pAlteredScene->RetrieveSceneObjects(true, winningTeam, autoResolved);
 			// Save out the altered scene before clearing out its data from memory
-			pAlteredScene->SaveData(METASAVEPATH + std::string(AUTOSAVENAME) + " - " + pAlteredScene->GetPresetName(), false);
+			pAlteredScene->SaveData(METASAVEPATH + std::string(AUTOSAVENAME) + " - " + pAlteredScene->GetPresetName());
 			// Clear the bitmap data etc of the altered scene, we don't need to copy that over
 			pAlteredScene->ClearData();