[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.167,2.168 resource.cpp,1.102,1.103 sound.cpp,1.155,1.156

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv25416/scumm

Modified Files:
	gfx.cpp resource.cpp sound.cpp 
Log Message:

Add support for Amiga version of Monkey Island 1
Palette is still wrong


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.167
retrieving revision 2.168
diff -u -d -r2.167 -r2.168
--- gfx.cpp	3 Jul 2003 23:59:35 -0000	2.167
+++ gfx.cpp	6 Jul 2003 06:19:52 -0000	2.168
@@ -1512,9 +1512,10 @@
 	// 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:

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- resource.cpp	26 Jun 2003 13:54:29 -0000	1.102
+++ resource.cpp	6 Jul 2003 06:19:52 -0000	1.103
@@ -652,7 +652,7 @@
 		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 {

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- sound.cpp	4 Jul 2003 14:10:44 -0000	1.155
+++ sound.cpp	6 Jul 2003 06:19:52 -0000	1.156
@@ -463,7 +463,9 @@
 		// 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();
 		}
 	}