From 01a458f8f2b7331bc125d1b3f2ed9f46e659abcf Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 23 Sep 2012 21:09:12 +0200 Subject: 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". --- engines/scumm/imuse/mac_m68k.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'engines/scumm/imuse/mac_m68k.cpp') diff --git a/engines/scumm/imuse/mac_m68k.cpp b/engines/scumm/imuse/mac_m68k.cpp index 4d7a6a64c0..0980ef1fd2 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) { -- cgit v1.2.3