aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2013-01-27 14:52:07 +0100
committerJohannes Schickel2013-01-27 14:52:07 +0100
commit1bab59aa069d142cc90b7f0ed93f96219a76ec22 (patch)
treec0916bfa7f6e375aa333db451834f4687c1b58ba
parent2dd0690d2648a67ab41185cd72d21d0425d3b9ca (diff)
downloadscummvm-rg350-1bab59aa069d142cc90b7f0ed93f96219a76ec22.tar.gz
scummvm-rg350-1bab59aa069d142cc90b7f0ed93f96219a76ec22.tar.bz2
scummvm-rg350-1bab59aa069d142cc90b7f0ed93f96219a76ec22.zip
SCUMM: Update handling of non so resources in Loom Mac.
This changes the warning to a debug and also updates the comment a bit. Thanks to eriktorbjorn for checking Loom Mac in an emulator.
-rw-r--r--engines/scumm/player_v3m.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/scumm/player_v3m.cpp b/engines/scumm/player_v3m.cpp
index bfb69fa508..0f222d84fe 100644
--- a/engines/scumm/player_v3m.cpp
+++ b/engines/scumm/player_v3m.cpp
@@ -148,11 +148,15 @@ bool Player_V3M::loadMusic(const byte *ptr) {
}
if (ptr[4] != 's' || ptr[5] != 'o') {
+ // Like the original we ignore all sound resources which do not have
+ // a 'so' tag in them.
// See bug #3602239 ("Mac Loom crashes using opening spell on
- // gravestone"). Apparently there is more than one type of
- // sound/music, and we only handle one of them at the moment.
- // Fortunately it is the most common and important one.
- warning("Player_V3M::loadMusic: Skipping unknown music type");
+ // gravestone") for a case where this is required. Loom Mac tries to
+ // play resource 11 here. This resource is no Mac sound resource
+ // though, it is a PC Speaker resource. A test with the original
+ // interpreter also has shown that no sound is played while the
+ // screen is shaking.
+ debug(5, "Player_V3M::loadMusic: Skipping unknown music type %02X%02X", ptr[4], ptr[5]);
resource.close();
return false;
}