SaveLoad: Only save game on map load when save_onload=true

Fixes #1886

This fixes a regression where saving the fog-of-war layers during map
transition would also save the player character regardless of
save_onload.

RELEASE_NOTES.txt

@@ -59,6 +59,7 @@ Engine fixes:
 * Fix single-frame "back_forth" animations taking an extra frame to complete.
 * Fix not being able to pick up loot with the mouse if the loot animation was looped.
 * Fix invisible icons in Powers menu when using gamepad/touch controls.
+* Fix regression that caused save_onload=false to have no effect.
 * Android: Fix 'Flare' directory not being automatically created.
 * Android: Added a dialog to direct the player to the wiki page for installing if no game data is found.
 

src/GameStatePlay.cpp

@@ -336,7 +336,7 @@ void GameStatePlay::checkTeleport() {
 			inpt->lock_all = (teleport_mapname == "maps/spawn.txt");
 			mapr->executeOnMapExitEvents();
 			showLoading();
-			save_load->saveGame();
+			save_load->saveFOW(); // TODO handle save_onload/save_onexit?
 			mapr->load(teleport_mapname);
 			setLoadingFrame();
 

src/SaveLoad.cpp

@@ -248,40 +248,8 @@ void SaveLoad::saveGame() {
 		}
 	}
 
-	// Save fow dark layer
-	if (mapr->fogofwar && mapr->save_fogofwar && !mapr->getFilename().empty() && fow->dark_layer_id < mapr->layernames.size()) {
-		ss.str("");
-		ss << settings->path_user << "saves/" << eset->misc.save_prefix << "/" << game_slot << "/fow/" << Utils::hashString(mapr->getFilename()) << ".txt";
-
-		outfile.open(Filesystem::convertSlashes(ss.str()).c_str(), std::ios::out);
-
-		if (outfile.is_open()) {
-			outfile << "# " << mapr->getFilename() << std::endl;
-			outfile << "[layer]" << std::endl;
-			outfile << "type=" << mapr->layernames[fow->dark_layer_id] << std::endl;
-			outfile << "data=" << std::endl;
-
-			std::string layer = "";
-			for (int line = 0; line < mapr->h; line++) {
-				std::stringstream map_row;
-				for (int tile = 0; tile < mapr->w; tile++) {
-					unsigned short val = mapr->layers[fow->dark_layer_id][tile][line];
-					map_row << val << ",";
-				}
-				layer += map_row.str();
-				layer += '\n';
-			}
-			layer.erase(layer.end()-2, layer.end());
-			layer += '\n';
-			outfile << layer << std::endl;
-
-			if (outfile.bad()) Utils::logError("SaveLoad: Unable to save map data. No write access or disk is full!");
-			outfile.close();
-			outfile.clear();
-
-			platform.FSCommit();
-		}
-	}
+	// save fog-of-war layers
+	saveFOW();
 
 	// Save extended Items
 	ss.str("");
@@ -717,3 +685,44 @@ void SaveLoad::loadPowerTree() {
 	// fall back to the default power tree
 	menu->pow->loadPowerTree("powers/trees/default.txt");
 }
+
+void SaveLoad::saveFOW() {
+	std::ofstream outfile;
+	std::stringstream ss;
+
+	// Save fow dark layer
+	if (mapr->fogofwar && mapr->save_fogofwar && !mapr->getFilename().empty() && fow->dark_layer_id < mapr->layernames.size()) {
+		ss.str("");
+		ss << settings->path_user << "saves/" << eset->misc.save_prefix << "/" << game_slot << "/fow/" << Utils::hashString(mapr->getFilename()) << ".txt";
+
+		outfile.open(Filesystem::convertSlashes(ss.str()).c_str(), std::ios::out);
+
+		if (outfile.is_open()) {
+			outfile << "# " << mapr->getFilename() << std::endl;
+			outfile << "[layer]" << std::endl;
+			outfile << "type=" << mapr->layernames[fow->dark_layer_id] << std::endl;
+			outfile << "data=" << std::endl;
+
+			std::string layer = "";
+			for (int line = 0; line < mapr->h; line++) {
+				std::stringstream map_row;
+				for (int tile = 0; tile < mapr->w; tile++) {
+					unsigned short val = mapr->layers[fow->dark_layer_id][tile][line];
+					map_row << val << ",";
+				}
+				layer += map_row.str();
+				layer += '\n';
+			}
+			layer.erase(layer.end()-2, layer.end());
+			layer += '\n';
+			outfile << layer << std::endl;
+
+			if (outfile.bad()) Utils::logError("SaveLoad: Unable to save map data. No write access or disk is full!");
+			outfile.close();
+			outfile.clear();
+
+			platform.FSCommit();
+		}
+	}
+
+}

src/SaveLoad.h

@@ -41,6 +41,7 @@ class SaveLoad {
 	void loadGame();
 	void loadClass(int index);
 	void loadStash();
+	void saveFOW();
 
 private:
 	void applyPlayerData();

src/Version.cpp

@@ -30,7 +30,7 @@ FLARE.  If not, see http://www.gnu.org/licenses/
 
 #include <SDL.h>
 
-Version VersionInfo::ENGINE(1, 14, 70);
+Version VersionInfo::ENGINE(1, 14, 71);
 Version VersionInfo::MIN(0, 0, 0);
 Version VersionInfo::MAX(USHRT_MAX, USHRT_MAX, USHRT_MAX);