[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.439,1.440

kirben kirben at users.sourceforge.net
Mon Apr 18 23:17:25 CEST 2005


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

Modified Files:
	scumm.cpp 
Log Message:

Add patch #1185667 - GS Fix


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -d -r1.439 -r1.440
--- scumm.cpp	19 Apr 2005 04:12:48 -0000	1.439
+++ scumm.cpp	19 Apr 2005 06:16:53 -0000	1.440
@@ -1687,7 +1687,8 @@
 void ScummEngine::setupMusic(int midi) {
 	_midiDriver = MidiDriver::detectMusicDriver(midi);
 	_native_mt32 = (ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32));
-	if ((_gameId == GID_TENTACLE) || (_gameId == GID_SAMNMAX))
+	// FIXME: MD_TOWNS should not be _midi_native in the first place!! iMuse code needs to be restructured.
+	if ((_gameId == GID_TENTACLE) || (_gameId == GID_SAMNMAX) || (_midiDriver == MD_TOWNS))
 		_enable_gs = false;
 	else 
 		_enable_gs = ConfMan.getBool("enable_gs");





More information about the Scummvm-git-logs mailing list