aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/imuse
diff options
context:
space:
mode:
authorJohannes Schickel2012-09-23 21:09:12 +0200
committerJohannes Schickel2012-09-23 21:12:06 +0200
commit01a458f8f2b7331bc125d1b3f2ed9f46e659abcf (patch)
treef2f7d8781b9cdcc645f928e8442adf7d2cbd7a13 /engines/scumm/imuse
parent3a5b3a514559d952bc0bf6e0bccbf900aa291930 (diff)
downloadscummvm-rg350-01a458f8f2b7331bc125d1b3f2ed9f46e659abcf.tar.gz
scummvm-rg350-01a458f8f2b7331bc125d1b3f2ed9f46e659abcf.tar.bz2
scummvm-rg350-01a458f8f2b7331bc125d1b3f2ed9f46e659abcf.zip
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".
Diffstat (limited to 'engines/scumm/imuse')
-rw-r--r--engines/scumm/imuse/mac_m68k.cpp4
1 files changed, 4 insertions, 0 deletions
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) {