[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.320.2.2,1.320.2.3

Travis Howell kirben at users.sourceforge.net
Sat Apr 17 00:27:03 CEST 2004


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

Modified Files:
      Tag: branch-0-6-0
	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.320.2.2
retrieving revision 1.320.2.3
diff -u -d -r1.320.2.2 -r1.320.2.3
--- sound.cpp	11 Apr 2004 22:21:09 -0000	1.320.2.2
+++ sound.cpp	17 Apr 2004 07:26:28 -0000	1.320.2.3
@@ -383,11 +383,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);





More information about the Scummvm-git-logs mailing list