[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.146,1.147 saveload.cpp,1.105,1.106 script_v5.cpp,1.171,1.172 scumm.h,1.291,1.292 scummvm.cpp,2.366,2.367 sound.cpp,1.221,1.222

[Travis Howell]

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

Modified Files:
	resource.cpp saveload.cpp script_v5.cpp scumm.h scummvm.cpp 
	sound.cpp 
Log Message:

Add atarist and macintosh options, since there seem to be no way to detect version been used.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- resource.cpp	30 Aug 2003 08:03:01 -0000	1.146
+++ resource.cpp	5 Sep 2003 07:36:05 -0000	1.147
@@ -1487,8 +1487,8 @@
 		wa_size = _fileHandle.readUint16LE();
 		_fileHandle.seek(wa_size - 2, SEEK_CUR);
 
-		//FIXME AD resources don't exist in Atari ST and Mac versions
-		if (_midiDriver == MD_ADLIB) {
+		if (!(_features & GF_ATARI_ST || _features & GF_MACINTOSH)) {
+			warning("Loader");
 			ad_offs = _fileHandle.pos();
 			ad_size = _fileHandle.readUint16LE();
 		}

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- saveload.cpp	30 Aug 2003 02:38:39 -0000	1.105
+++ saveload.cpp	5 Sep 2003 07:36:05 -0000	1.106
@@ -176,7 +176,7 @@
 		else
 			setupV1ZakPalette();
 	} else if (_features & GF_16COLOR) {
-		if (_features & GF_AMIGA)
+		if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST))
 			setupAmigaPalette();
 		else
 			setupEGAPalette();

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- script_v5.cpp	5 Sep 2003 03:55:48 -0000	1.171
+++ script_v5.cpp	5 Sep 2003 07:36:05 -0000	1.172
@@ -1057,7 +1057,7 @@
 	int a;
 	getResultPos();
 
-	if (_gameId == GID_INDY3)
+	if ((_gameId == GID_INDY3) && !(_features & GF_MACINTOSH))
 		a = getVarOrDirectByte(0x80);
 	else
 		a = getVarOrDirectWord(0x80);
@@ -1069,7 +1069,7 @@
 	int a;
 	getResultPos();
 
-	if (_gameId == GID_INDY3) {
+	if ((_gameId == GID_INDY3) && !(_features & GF_MACINTOSH)) {
 		a = getVarOrDirectByte(0x80);
 
 		// WORKAROUND bug #636433 (can't get into Zeppelin) 
@@ -2496,7 +2496,7 @@
 void Scumm_v5::o5_wait() {
 	const byte *oldaddr = _scriptPointer - 1;
 
-	if (_gameId == GID_INDY3) {
+	if ((_gameId == GID_INDY3) && !(_features & GF_MACINTOSH)) {
 		_opcode = 2;
 	} else
 		_opcode = fetchScriptByte();

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- scumm.h	29 Aug 2003 02:39:05 -0000	1.291
+++ scumm.h	5 Sep 2003 07:36:05 -0000	1.292
@@ -86,6 +86,8 @@
 	GF_FMTOWNS             = 1 << 16,
 	GF_FEW_LOCALS          = 1 << 17,
 	GF_NES                 = 1 << 18,
+	GF_ATARI_ST            = 1 << 19,
+	GF_MACINTOSH           = 1 << 20,
 
 	GF_EXTERNAL_CHARSET    = GF_SMALL_HEADER
 };

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.366
retrieving revision 2.367
diff -u -d -r2.366 -r2.367
--- scummvm.cpp	4 Sep 2003 15:24:58 -0000	2.366
+++ scummvm.cpp	5 Sep 2003 07:36:05 -0000	2.367
@@ -234,6 +234,11 @@
 
 	if (detector->_amiga)
 		detector->_game.features |= GF_AMIGA;
+	if (detector->_atari_st)
+		detector->_game.features |= GF_ATARI_ST;
+	if (detector->_macintosh) {
+		detector->_game.features |= GF_MACINTOSH;
+	}
 
 	switch (detector->_game.version) {
 	case 1:
@@ -943,7 +948,7 @@
 			_roomPalette[i] = i;
 			_shadowPalette[i] = i;
 		}
-		if (_features & GF_AMIGA)
+		if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST))
 			setupAmigaPalette();
 		else
 			setupEGAPalette();

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- sound.cpp	5 Sep 2003 06:22:09 -0000	1.221
+++ sound.cpp	5 Sep 2003 07:36:05 -0000	1.222
@@ -436,7 +436,7 @@
 
 	// Used in Amiga verisons of indy3ega and loom
 	// Used in Mac. version of indy3ega
-	if (((_scumm->_features & GF_OLD_BUNDLE) && (_scumm->_gameId == GID_INDY3)) || ((_scumm->_features & GF_AMIGA) && (_scumm->_version == 3))) {
+	if (((_scumm->_features & GF_MACINTOSH) && (_scumm->_gameId == GID_INDY3)) || ((_scumm->_features & GF_AMIGA) && (_scumm->_version == 3))) {
 		if (ptr[26] == 00) {
 			size = READ_BE_UINT16(ptr + 12);
 			rate = 3579545 / READ_BE_UINT16(ptr + 20);