[Scummvm-cvs-logs] SF.net SVN: scummvm:[52620] scummvm/trunk/engines/sci/sci.cpp

[thebluegr at users.sourceforge.net]

Revision: 52620
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52620&view=rev
Author:   thebluegr
Date:     2010-09-07 15:09:59 +0000 (Tue, 07 Sep 2010)

Log Message:
-----------
SCI: Now distinguishing between native MT-32 MIDI from GM devices when checking
for the existence of after market GM patches

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sci.cpp

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-09-07 14:17:31 UTC (rev 52619)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-09-07 15:09:59 UTC (rev 52620)
@@ -313,7 +313,7 @@
 	// Show a warning if the user has selected a General MIDI device, no GM patch exists
 	// (i.e. patch 4) and the game is one of the known 8 SCI1 games that Sierra has provided
 	// after market patches for in their "General MIDI Utility".
-	if (_soundCmd->getMusicType() == MT_GM) {
+	if (_soundCmd->getMusicType() == MT_GM && !ConfMan.getBool("native_mt32")) {
 		if (!_resMan->findResource(ResourceId(kResourceTypePatch, 4), 0)) {
 			switch (getGameId()) {
 			case GID_ECOQUEST:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.