[Scummvm-git-logs] scummvm master -> 06052c78eac354a284a11b56d614ed15f3b34fdf

[AndywinXp]

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:
06052c78ea SCUMM: Use "compat" param when checking for heap saves in loadState()


Commit: 06052c78eac354a284a11b56d614ed15f3b34fdf
    https://github.com/scummvm/scummvm/commit/06052c78eac354a284a11b56d614ed15f3b34fdf
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-09-15T10:48:18+02:00

Commit Message:
SCUMM: Use "compat" param when checking for heap saves in loadState()

Unfortunately _saveTemporaryState really is unrealiable.

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index b1fe1f2f4f3..e6c98be983b 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -678,7 +678,7 @@ bool ScummEngine::loadState(int slot, bool compat, Common::String &filename) {
 	_saveLoadDescription = hdr.name;
 
 	// Set to 0 during load to minimize stuttering
-	if (_musicEngine && !_saveTemporaryState)
+	if (_musicEngine && !compat)
 		_musicEngine->setMusicVolume(0);
 
 	// Unless specifically requested with _saveSound, we do not save the iMUSE
@@ -696,10 +696,10 @@ bool ScummEngine::loadState(int slot, bool compat, Common::String &filename) {
 	// HE games explicitly do not stop sounds when loading a "heap save",
 	// under version 80!
 
-	if ((!_imuse || _saveSound || !_saveTemporaryState) &&
-		!(_saveTemporaryState && _game.heversion < 80)) {
+	if ((!_imuse || _saveSound || !compat) &&
+		!(compat && _game.heversion < 80)) {
 		_sound->stopAllSounds();
-	} else if (_saveTemporaryState && !_imuseDigital && _game.heversion == 0) {
+	} else if (compat && !_imuseDigital && _game.heversion == 0) {
 		// Still, we have to stop the talking sound even
 		// if the save state is temporary.
 		_sound->stopTalkSound();