Add support for Amiga version of Monkey Island 1

Palette is still wrong

svn-id: r8790
This commit is contained in:
Travis Howell 2003-07-06 06:19:52 +00:00
parent fb6b42bb93
commit 580e9ec770
3 changed files with 6 additions and 3 deletions

View file

@ -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:

View file

@ -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 {

View file

@ -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();
}
}