[Scummvm-git-logs] scummvm master -> 67cdc309b06b4252ca10b258dbc0cef782fd1b79

AndywinXp noreply at scummvm.org
Tue Aug 22 14:35:31 UTC 2023


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:
67cdc309b0 SCUMM: HE (Sound): Fix HE60 sound-running opcode for MIDI sound


Commit: 67cdc309b06b4252ca10b258dbc0cef782fd1b79
    https://github.com/scummvm/scummvm/commit/67cdc309b06b4252ca10b258dbc0cef782fd1b79
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-08-22T16:35:21+02:00

Commit Message:
SCUMM: HE (Sound): Fix HE60 sound-running opcode for MIDI sound

Changed paths:
    engines/scumm/he/sound_he.cpp


diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index 704f8bf38a6..cdeb3bbc17e 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -205,6 +205,10 @@ int SoundHE::isSoundRunning(int sound) const {
 			if (hsFindSoundChannel(sound) != -1) {
 				return sound;
 			}
+
+			if (_vm->_musicEngine && _vm->_musicEngine->getSoundStatus(sound)) {
+				return sound;
+			}
 		}
 
 		return 0;




More information about the Scummvm-git-logs mailing list