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

[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:
9c724a203c SCUMM: HE (Sound): Do not stop sounds for heap saves under version 80


Commit: 9c724a203c4568a804545bee1f1596535d5b2e0b
    https://github.com/scummvm/scummvm/commit/9c724a203c4568a804545bee1f1596535d5b2e0b
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-09-14T21:43:24+02:00

Commit Message:
SCUMM: HE (Sound): Do not stop sounds for heap saves under version 80

This is explicitly what HE72 and below asks; it is implied that
whatever sound will be running at that point will be handled
via the scripts.

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 0cef5ae7e56..a7c4b553e7d 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -692,10 +692,14 @@ bool ScummEngine::loadState(int slot, bool compat, Common::String &filename) {
 	//
 	// If we don't have iMUSE at all we may as well stop the sounds. The previous
 	// default behavior here was to stopAllSounds on all state restores.
+	//
+	// HE games explicitly do not stop sounds when loading a "heap save",
+	// under version 80!
 
-	if (!_imuse || _saveSound || !_saveTemporaryState) {
+	if ((!_imuse || _saveSound || !_saveTemporaryState) &&
+		!(_saveTemporaryState && _game.heversion < 80)) {
 		_sound->stopAllSounds();
-	} else if (_saveTemporaryState && !_imuseDigital) {
+	} else if (_saveTemporaryState && !_imuseDigital && _game.heversion == 0) {
 		// Still, we have to stop the talking sound even
 		// if the save state is temporary.
 		_sound->stopTalkSound();