[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.351,1.352

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv26278/scummvm/simon

Modified Files:
	simon.cpp 
Log Message:
Added support for Simon 2's native MT-32 music tracks

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -d -r1.351 -r1.352
--- simon.cpp	2 Dec 2003 11:17:21 -0000	1.351
+++ simon.cpp	9 Dec 2003 10:19:27 -0000	1.352
@@ -209,7 +209,10 @@
 		VGA_MEM_SIZE = gVars->memory[kMemSimon2Games];
 #endif
 		TABLES_MEM_SIZE = 100000;
-		MUSIC_INDEX_BASE = 1128 / 4;
+		if ((_game & GF_SIMON2) && ConfMan.getBool("native_mt32"))
+			MUSIC_INDEX_BASE = (1128 + 612) / 4;
+		else
+			MUSIC_INDEX_BASE = 1128 / 4;
 		SOUND_INDEX_BASE = 1660 / 4;
 	} else {
 		VGA_DELAY_BASE = 1;
@@ -5040,7 +5043,7 @@
 	if (_game & GF_SIMON2) {        // Simon 2 music
 		midi.stop();
 		_game_file->seek(_game_offsets_ptr[MUSIC_INDEX_BASE + music - 1], SEEK_SET);
-		if (_game & GF_WIN) {	
+		if (_game & GF_WIN && !ConfMan.getBool("native_mt32")) {	
 			midi.loadMultipleSMF (_game_file);
 		} else {
 			midi.loadXMIDI (_game_file);