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

[Jamieson Christian]

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

Modified Files:
	simon.cpp 
Log Message:
Fix for Bug [812995] MT-32: wrong channel mapping

Implemented channel mask for Simon 1/2
when using --native-mt32.

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -d -r1.304 -r1.305
--- simon.cpp	29 Sep 2003 04:15:24 -0000	1.304
+++ simon.cpp	1 Oct 2003 17:34:46 -0000	1.305
@@ -203,8 +203,6 @@
 	: Engine(detector, syst), midi (syst) {
 	OSystem::Property prop;
 
-	MidiDriver *driver = detector->createMidi();
-	
 	_vc_ptr = 0;
 	_game_offsets_ptr = 0;
 	
@@ -476,8 +474,11 @@
 	set_volume(detector->_sfx_volume);
 
 	// Setup midi driver
+	MidiDriver *driver = detector->createMidi();
 	if (!driver)
 		driver = MidiDriver_ADLIB_create(_mixer);
+	else if (detector->_native_mt32)
+		driver->property (MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
 
 	midi.mapMT32toGM (!(_game & GF_SIMON2) && !detector->_native_mt32);
 	midi.set_driver(driver);