[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.330,1.331

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5883/scumm

Modified Files:
	sound.cpp 
Log Message:

Amiga Monkey Island 1 sound update from Quietust:
Allows MP3 music support in demo and full game.


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -d -r1.330 -r1.331
--- sound.cpp	11 Apr 2004 22:20:41 -0000	1.330
+++ sound.cpp	17 Apr 2004 07:22:02 -0000	1.331
@@ -402,11 +402,12 @@
 				int track = -1;
 				if (soundID == 50)
 					track = 17;
-				else if (soundID == 53)
-					track = 18;
-				else if ((soundID >= 100) && (soundID <= 118)) {
-					char tracks[19] = {7,6,4,12,2,2,2,2,5,10,1,16,8,9,13,11,15,3,14};
-					track = tracks[soundID - 100];
+				else if (ptr[6] == 0x7F && ptr[7] == 0x00 && ptr[8] == 0x80)
+				{
+					char tracks[16] = {13,14,10,3,4,9,16,5,1,8,2,15,6,7,11,12};
+					if (ptr[9] == 0x0E)
+						track = 18;
+					else	track = tracks[ptr[9] - 0x23];
 				}
 				if (track != -1) {
 					playCDTrack(track,((track < 5) || (track > 16)) ? 1 : -1,0,0);