[Scummvm-cvs-logs] scummvm master -> 69adb13c2f3cadd4dac2bba8164aa0b8a9400abc

lordhoto lordhoto at gmail.com
Sun Jul 17 02:33:13 CEST 2011


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:
8800794f4d SCUMM: Clarify PC Speaker style sound resource handling with a comment.
69adb13c2f SCUMM: Fix strange noise in Indy4 outro with AdLib/FM-Towns output.


Commit: 8800794f4d89f9f920a623dd39cd9d4cf370f827
    https://github.com/scummvm/scummvm/commit/8800794f4d89f9f920a623dd39cd9d4cf370f827
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-07-16T15:08:52-07:00

Commit Message:
SCUMM: Clarify PC Speaker style sound resource handling with a comment.

Changed paths:
    engines/scumm/sound.cpp



diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 544abe6..4d9086b 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -1142,6 +1142,9 @@ int ScummEngine::readSoundResource(ResId idx) {
 				break;
 			}
 
+			// We only allow SPK resources for PC Speaker, PCJr and CMS here
+			// since other resource would sound horribly with their output
+			// drivers.
 			if ((_musicType == MDT_PCSPK || _musicType == MDT_PCJR || _musicType == MDT_CMS) && pri != 11)
 				pri = -1;
 


Commit: 69adb13c2f3cadd4dac2bba8164aa0b8a9400abc
    https://github.com/scummvm/scummvm/commit/69adb13c2f3cadd4dac2bba8164aa0b8a9400abc
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-07-16T17:27:33-07:00

Commit Message:
SCUMM: Fix strange noise in Indy4 outro with AdLib/FM-Towns output.

Formerly we tried to play back a ROL resource on AdLib in this case, since the
game does not contain a ADL resource for the sound the game tries to play here.
The original does not exhibit this behavior, thus I changed it to behave the
same now.

Big thanks to eriktorbjorn for noticing and finding the cause of this problem.
Also thanks to Kirben for checking how the original behaved and _athrxx for
checking the FM-Towns version of Indy4.

Changed paths:
    engines/scumm/sound.cpp



diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 4d9086b..c3cad19 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -1148,6 +1148,16 @@ int ScummEngine::readSoundResource(ResId idx) {
 			if ((_musicType == MDT_PCSPK || _musicType == MDT_PCJR || _musicType == MDT_CMS) && pri != 11)
 				pri = -1;
 
+			// We only allow ADL resources when AdLib or FM-Towns is used as
+			// primary audio output. This fixes some odd sounds when Indy and
+			// Sophia leave Atlantis with the submarine in Indy4. (Easy to
+			// check with bootparam 4061 in the CD version). It seems the game
+			// only contains a ROL resource for sound id 60. Formerly we tried
+			// to play that via the AdLib or FM-Towns audio driver resulting
+			// in strange noises. Now we behave like the original did.
+			if ((_musicType == MDT_ADLIB || _musicType == MDT_TOWNS) && pri != 10)
+				pri = -1;
+
 			debugC(DEBUG_RESOURCE, "    tag: %s, total_size=%d, pri=%d", tag2str(tag), size, pri);
 
 






More information about the Scummvm-git-logs mailing list