aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sci.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2010-09-07 15:09:59 +0000
committerFilippos Karapetis2010-09-07 15:09:59 +0000
commitcb0e54034dbed6a3fc34b391f42ff5a97b2e26e0 (patch)
tree4ee027bb39cfba4e1fd5cc6efea3f685e4150700 /engines/sci/sci.cpp
parentfd407eeca3f2d50bc1a005bbcfd171369daa4f5f (diff)
downloadscummvm-rg350-cb0e54034dbed6a3fc34b391f42ff5a97b2e26e0.tar.gz
scummvm-rg350-cb0e54034dbed6a3fc34b391f42ff5a97b2e26e0.tar.bz2
scummvm-rg350-cb0e54034dbed6a3fc34b391f42ff5a97b2e26e0.zip
SCI: Now distinguishing between native MT-32 MIDI from GM devices when checking
for the existence of after market GM patches svn-id: r52620
Diffstat (limited to 'engines/sci/sci.cpp')
-rw-r--r--engines/sci/sci.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 8fc0f667d3..9170473745 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -313,7 +313,7 @@ Common::Error SciEngine::run() {
// 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: