[Scummvm-git-logs] scummvm master -> 9bc8fa96c57a2a1d7c2633f727e07664c656160b

[mduggan]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9bc8fa96c5 ULTIMA8: Flush conf changes to disk.


Commit: 9bc8fa96c57a2a1d7c2633f727e07664c656160b
    https://github.com/scummvm/scummvm/commit/9bc8fa96c57a2a1d7c2633f727e07664c656160b
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-02-24T21:39:34+09:00

Commit Message:
ULTIMA8: Flush conf changes to disk.

Conf changes which are "unlocked" by game actions and most recent savegame
should be persisted.  Additionally, the endgame movie should unlock quotes
(which are also unlocked by watching the credits).

Fixes #12184.

Changed paths:
    engines/ultima/ultima8/games/game.cpp
    engines/ultima/ultima8/gumps/credits_gump.cpp
    engines/ultima/ultima8/ultima8.cpp


diff --git a/engines/ultima/ultima8/games/game.cpp b/engines/ultima/ultima8/games/game.cpp
index a854a49ac3..e4d576643d 100644
--- a/engines/ultima/ultima8/games/game.cpp
+++ b/engines/ultima/ultima8/games/game.cpp
@@ -61,6 +61,8 @@ Game *Game::createGame(const GameInfo *info) {
 
 uint32 Game::I_playEndgame(const uint8 *args, unsigned int /*argsize*/) {
 	ConfMan.setBool("endgame", true);
+	ConfMan.setBool("quotes", true);
+	ConfMan.flushToDisk();
 
 	PaletteManager *palman = PaletteManager::get_instance();
 	palman->untransformPalette(PaletteManager::Pal_Game);
diff --git a/engines/ultima/ultima8/gumps/credits_gump.cpp b/engines/ultima/ultima8/gumps/credits_gump.cpp
index 35e54dc7e2..a57c5e5dba 100644
--- a/engines/ultima/ultima8/gumps/credits_gump.cpp
+++ b/engines/ultima/ultima8/gumps/credits_gump.cpp
@@ -164,6 +164,7 @@ void CreditsGump::run() {
 
 		if (!_configKey.empty()) {
 			ConfMan.setBool(_configKey, true);
+			ConfMan.flushToDisk();
 		}
 
 		return;
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 3cf54294aa..8577ee3f4e 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -903,6 +903,8 @@ Common::Error Ultima8Engine::loadGameState(int slot) {
 	else
 		ConfMan.set("lastSave", "");
 
+	ConfMan.flushToDisk();
+
 	return result;
 }
 
@@ -916,6 +918,8 @@ Common::Error Ultima8Engine::saveGameState(int slot, const Common::String &desc,
 			ConfMan.set("lastSave", "");
 	}
 
+	ConfMan.flushToDisk();
+
 	return result;
 }