[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.286,2.287 sound.cpp,1.169,1.170

[Travis Howell]

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

Modified Files:
	scummvm.cpp sound.cpp 
Log Message:

Make the Amiga option costumes/palette only again.


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.286
retrieving revision 2.287
diff -u -d -r2.286 -r2.287
--- scummvm.cpp	15 Jul 2003 10:16:45 -0000	2.286
+++ scummvm.cpp	17 Jul 2003 11:20:20 -0000	2.287
@@ -629,7 +629,7 @@
 		_imuse = NULL;
 		_playerV2 = NULL;
 	} else if (_features & GF_OLD_BUNDLE) {
-		if ((_features & GF_AMIGA) || ((_version == 1) && (_gameId == GID_MANIAC)))
+		if ((_version == 1) && (_gameId == GID_MANIAC))
 			_playerV2 = NULL;
 		else
 			_playerV2 = new Player_V2(this);

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- sound.cpp	15 Jul 2003 22:21:30 -0000	1.169
+++ sound.cpp	17 Jul 2003 11:20:31 -0000	1.170
@@ -489,21 +489,23 @@
 	if ((_scumm->_features & GF_AMIGA) && (_scumm->_version == 3))
 	{
 		// experimental support for Indy3 Amiga sound effects
-		if (READ_BE_UINT16(ptr + 26) == 0x00FF)		// looped sound
-			// TODO: support looping sounds
-			// ptr + 14 seems to be looping duration
-			flags = 0;
-		else if (READ_BE_UINT16(ptr + 26) == 0x0001)	// nonlooped sound
-			flags = 0;	// 
-		else if (READ_BE_UINT16(ptr + 26) == 0x0101)	// background music
-			// TODO: support music
+		bool amigatest = (READ_LE_UINT16(ptr + 26) == 0x0001) || (READ_LE_UINT16(ptr + 26) == 0x0001)
+		 || (READ_LE_UINT16(ptr + 26) == 0x00FF);
+		if (amigatest) {
+			if (READ_BE_UINT16(ptr + 26) == 0x00FF)		// looped sound
+				// TODO: support looping sounds
+				// ptr + 14 seems to be looping duration
+				flags = 0;
+			else if (READ_BE_UINT16(ptr + 26) == 0x0001)	// nonlooped sound
+				flags = 0;	// 
+			else if (READ_BE_UINT16(ptr + 26) == 0x0101)	// background music
+				// TODO: support music
+				return;
+			size = READ_BE_UINT16(ptr + 12);
+			rate = 11000;
+			_scumm->_mixer->playRaw(NULL, ptr + 28, size, rate, flags, soundID);
 			return;
-		else
-			debug(3,"Unknown sound type detected!");
-		size = READ_BE_UINT16(ptr + 12);
-		rate = 11000;
-		_scumm->_mixer->playRaw(NULL, ptr + 28, size, rate, flags, soundID);
-		return;
+		}
 	}
 
 	if (_scumm->_features & GF_OLD_BUNDLE) {