diff options
| -rw-r--r-- | scumm/gfx.cpp | 3 | ||||
| -rw-r--r-- | scumm/resource.cpp | 2 | ||||
| -rw-r--r-- | scumm/sound.cpp | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 9e95caf67e..034717f690 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -1512,9 +1512,10 @@ bool Gdi::decompressBitmap(byte *bgbak_ptr, const byte *src, int numLinesToProce // 8/9 used in 3do version of puttputt joins the parade maybe others case 8: case 9: + error("decompressBitmap: Graphics codec %d not yet supported\n", code); // used in amiga version of Monkey Island case 10: - error("decompressBitmap: Graphics codec %d not yet supported\n", code); + decodeStripEGA(bgbak_ptr, src, numLinesToProcess); break; case 14: diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 421f773f22..055c8489a9 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -652,7 +652,7 @@ int Scumm::loadResource(int type, int idx) { tag = _fileHandle.readUint16LE(); _fileHandle.seek(-6, SEEK_CUR); /* FIXME */ - if ((type == rtSound) && (_gameId != GID_ZAK256)) { + if ((type == rtSound) && !(_features & GF_AMIGA) && (_gameId != GID_ZAK256)) { return readSoundResourceSmallHeader(type, idx); } } else { diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 6bac62dd21..897854ebe5 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -463,7 +463,9 @@ void Sound::playSound(int soundID) { // This hack relays on the fact that we currently don't support SFX // in these games, only music. Once we add SFX support, we'll have to // revise it / replace it by a proper fix. - if (ptr) { + if (_scumm->_features & GF_AMIGA) + return; + else if (ptr) { _scumm->_imuse->stop_all_sounds(); } } |