[Scummvm-git-logs] scummvm master -> 5704af70a0275858b4bf85685c77d10934d13c44

[athrxx]

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:
5704af70a0 SCUMM: fix bug no. 13901


Commit: 5704af70a0275858b4bf85685c77d10934d13c44
    https://github.com/scummvm/scummvm/commit/5704af70a0275858b4bf85685c77d10934d13c44
Author: athrxx (athrxx at scummvm.org)
Date: 2022-10-24T01:17:49+02:00

Commit Message:
SCUMM: fix bug no. 13901

(Monkey 1 EGA / CMS music and sound effects dissapear after loading saved game)

This is at least one obvious bug which I found. For CMS sound the sound resources get invalidated after one use which is only supposed to happen if the resource cannot be loaded.

MI1 also has other issues with CMS sound if the user changes the sound setting between savegames. The savegames are not compatible. But that is a more complex thing to fix and might not be related to the bug ticket.

Also, we might need to restore sounds that were currently playing at the time of saving (but I have to check if the original actually does that for CMS).

Changed paths:
    engines/scumm/sound.cpp


diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 70072425529..bc96909b75d 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -2451,6 +2451,7 @@ int ScummEngine::readSoundResourceSmallHeader(ResId idx) {
 				_fileHandle->read(_res->createResource(rtSound, idx, wa_size + 6), wa_size + 6);
 			}
 		}
+		return 1;
 	} else if (ad_offs != 0) {
 		// AD resources have a header, instrument definitions and one MIDI track.
 		// We build an 'ADL ' resource from that: