[Scummvm-git-logs] scummvm master -> 1f17876e0aaa1550761a7b4482eed565351fa4cb

[dreammaster]

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

Summary:
4916bf7cf1 ULTIMA8: Resetting lastSave use empty string rather than -1
1f17876e0a ULTIMA8: Stop active music when loading the new game diary entry


Commit: 4916bf7cf1aaca6b96b2366643f0873dd483c35b
    https://github.com/scummvm/scummvm/commit/4916bf7cf1aaca6b96b2366643f0873dd483c35b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-28T20:29:33-08:00

Commit Message:
ULTIMA8: Resetting lastSave use empty string rather than -1

Changed paths:
    engines/ultima/ultima8/ultima8.cpp


diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 68bbb0908c..50096eb2ba 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -1015,7 +1015,10 @@ bool Ultima8Engine::saveGame(int slot, const Std::string &desc, bool ignore_moda
 
 Common::Error Ultima8Engine::loadGameState(int slot) {
 	Common::Error result = Shared::UltimaEngine::loadGameState(slot);
-	_settingMan->set("lastSave", (result.getCode() == Common::kNoError) ? slot : -1);
+	if (result.getCode() == Common::kNoError)
+		_settingMan->set("lastSave", slot);
+	else
+		_settingMan->set("lastSave", "");
 
 	return result;
 }
@@ -1023,8 +1026,12 @@ Common::Error Ultima8Engine::loadGameState(int slot) {
 Common::Error Ultima8Engine::saveGameState(int slot, const Common::String &desc, bool isAutosave) {
 	Common::Error result = Shared::UltimaEngine::saveGameState(slot, desc, isAutosave);;
 
-	if (!isAutosave)
-		_settingMan->set("lastSave", (result.getCode() == Common::kNoError) ? slot : -1);
+	if (!isAutosave) {
+		if (result.getCode() == Common::kNoError)
+			_settingMan->set("lastSave", slot);
+		else
+			_settingMan->set("lastSave", "");
+	}
 
 	return result;
 }
@@ -1209,7 +1216,7 @@ bool Ultima8Engine::newGame(int saveSlot) {
 	_game->startInitialUsecode(saveSlot);
 
 	if (saveSlot == -1)
-		_settingMan->set("lastSave", -1);
+		_settingMan->set("lastSave", "");
 
 	return true;
 }


Commit: 1f17876e0aaa1550761a7b4482eed565351fa4cb
    https://github.com/scummvm/scummvm/commit/1f17876e0aaa1550761a7b4482eed565351fa4cb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-28T21:14:15-08:00

Commit Message:
ULTIMA8: Stop active music when loading the new game diary entry

Changed paths:
    engines/ultima/ultima8/audio/music_process.cpp
    engines/ultima/ultima8/ultima8.cpp


diff --git a/engines/ultima/ultima8/audio/music_process.cpp b/engines/ultima/ultima8/audio/music_process.cpp
index c3ab096e75..59155c27a2 100644
--- a/engines/ultima/ultima8/audio/music_process.cpp
+++ b/engines/ultima/ultima8/audio/music_process.cpp
@@ -56,6 +56,7 @@ MusicProcess::MusicProcess(MidiPlayer *player) : _midiPlayer(player),
 }
 
 MusicProcess::~MusicProcess() {
+	_midiPlayer->stop();
 	_theMusicProcess = 0;
 }
 
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 50096eb2ba..44592a1add 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -385,11 +385,6 @@ void Ultima8Engine::shutdownGame(bool reloading) {
 	_mouse->popAllCursors();
 	_mouse->pushMouseCursor();
 
-	if (_audioMixer) {
-		_audioMixer->closeMidiOutput();
-		_audioMixer->reset();
-	}
-
 	FORGET_OBJECT(_world);
 	_objectManager->reset();
 	FORGET_OBJECT(_ucMachine);
@@ -400,6 +395,11 @@ void Ultima8Engine::shutdownGame(bool reloading) {
 	FORGET_OBJECT(_game);
 	FORGET_OBJECT(_gameData);
 
+	if (_audioMixer) {
+		_audioMixer->closeMidiOutput();
+		_audioMixer->reset();
+	}
+
 	_desktopGump = 0;
 	_gameMapGump = 0;
 	_scalerGump = 0;