[Scummvm-cvs-logs] scummvm master -> 1bab59aa069d142cc90b7f0ed93f96219a76ec22

[lordhoto]

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:
1bab59aa06 SCUMM: Update handling of non so resources in Loom Mac.


Commit: 1bab59aa069d142cc90b7f0ed93f96219a76ec22
    https://github.com/scummvm/scummvm/commit/1bab59aa069d142cc90b7f0ed93f96219a76ec22
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-01-27T05:52:07-08:00

Commit Message:
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.

Changed paths:
    engines/scumm/player_v3m.cpp



diff --git a/engines/scumm/player_v3m.cpp b/engines/scumm/player_v3m.cpp
index bfb69fa..0f222d8 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;
 	}