[Scummvm-cvs-logs] scummvm master -> 01a458f8f2b7331bc125d1b3f2ed9f46e659abcf

[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:
01a458f8f2 SCUMM: Add check for resource fork for ".iMUSE Setups".


Commit: 01a458f8f2b7331bc125d1b3f2ed9f46e659abcf
    https://github.com/scummvm/scummvm/commit/01a458f8f2b7331bc125d1b3f2ed9f46e659abcf
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-09-23T12:12:06-07:00

Commit Message:
SCUMM: Add check for resource fork for ".iMUSE Setups".

This should help identify incorrect dumps/file naming like what (probably)
happened in bug #3570973
"FOA: Doesn't start anymore after adding Mac sound support".

Changed paths:
    engines/scumm/imuse/mac_m68k.cpp



diff --git a/engines/scumm/imuse/mac_m68k.cpp b/engines/scumm/imuse/mac_m68k.cpp
index 4d7a6a6..0980ef1 100644
--- a/engines/scumm/imuse/mac_m68k.cpp
+++ b/engines/scumm/imuse/mac_m68k.cpp
@@ -194,6 +194,10 @@ void MacM68kDriver::generateSamples(int16 *buf, int len) {
 void MacM68kDriver::loadAllInstruments() {
 	Common::MacResManager resource;
 	if (resource.open("iMUSE Setups")) {
+		if (!resource.hasResFork()) {
+			error("MacM68kDriver::loadAllInstruments: \"iMUSE Setups\" loaded, but no resource fork present");
+		}
+
 		for (int i = 0x3E7; i < 0x468; ++i) {
 			Common::SeekableReadStream *stream = resource.getResource(MKTAG('s', 'n', 'd', ' '), i);
 			if (stream) {