[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.304,1.305

[Travis Howell]

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

Modified Files:
	sound.cpp 
Log Message:

Add support for mp3 or ogg musics tracks for Monkey Island 1 for Amiga.


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -d -r1.304 -r1.305
--- sound.cpp	27 Dec 2003 21:33:34 -0000	1.304
+++ sound.cpp	29 Dec 2003 08:19:57 -0000	1.305
@@ -371,8 +371,23 @@
 		
 		if (_scumm->_gameId == GID_MONKEY_VGA || _scumm->_gameId == GID_MONKEY_EGA) {
 			// Sound is currently not supported at all in the amiga versions of these games
-			if (_scumm->_features & GF_AMIGA)
+			if (_scumm->_features & GF_AMIGA) {
+				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];
+				}
+				if (track != -1) {
+					playCDTrack(track,((track < 5) || (track > 16)) ? 1 : -1,0,0);
+					stopCDTimer();
+					_currentCDSound = soundID;
+				}
 				return;
+			}
 	
 			// Works around the fact that in some places in MonkeyEGA/VGA,
 			// the music is never explicitly stopped.