[Scummvm-cvs-logs] scummvm master -> 2dd0690d2648a67ab41185cd72d21d0425d3b9ca

[eriktorbjorn]

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:
2dd0690d26 SCUMM: Work around bug #3602239 ("Mac Loom crashes using opening...")


Commit: 2dd0690d2648a67ab41185cd72d21d0425d3b9ca
    https://github.com/scummvm/scummvm/commit/2dd0690d2648a67ab41185cd72d21d0425d3b9ca
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-01-27T00:38:01-08:00

Commit Message:
SCUMM: Work around bug #3602239 ("Mac Loom crashes using opening...")

Skip music resources that don't have the "so" (song?) tag. It is
better than asserting, now that it turns out that they do exist.

Changed paths:
    engines/scumm/player_v3m.cpp



diff --git a/engines/scumm/player_v3m.cpp b/engines/scumm/player_v3m.cpp
index e614631..bfb69fa 100644
--- a/engines/scumm/player_v3m.cpp
+++ b/engines/scumm/player_v3m.cpp
@@ -147,7 +147,15 @@ bool Player_V3M::loadMusic(const byte *ptr) {
 		return false;
 	}
 
-	assert(ptr[4] == 's' && ptr[5] == 'o');
+	if (ptr[4] != 's' || ptr[5] != 'o') {
+		// 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");
+		resource.close();
+		return false;
+	}
 
 	uint i;
 	for (i = 0; i < 5; i++) {