aboutsummaryrefslogtreecommitdiff
path: root/simon/simon.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2004-10-23 00:36:09 +0000
committerEugene Sandulenko2004-10-23 00:36:09 +0000
commit670d84362546e24e9933f1274f83efeeb65b586f (patch)
tree9d24572db00d37bcbc30f0639cf76c2f0548f400 /simon/simon.cpp
parent03df05bd967f13b8b8eb652a6a7ea373dd947971 (diff)
downloadscummvm-rg350-670d84362546e24e9933f1274f83efeeb65b586f.tar.gz
scummvm-rg350-670d84362546e24e9933f1274f83efeeb65b586f.tar.bz2
scummvm-rg350-670d84362546e24e9933f1274f83efeeb65b586f.zip
oops
svn-id: r15660
Diffstat (limited to 'simon/simon.cpp')
-rw-r--r--simon/simon.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 8e3a905501..6701b1dea6 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -5125,7 +5125,7 @@ void SimonEngine::loadMusic (uint music) {
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 && !(ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32))) {
+ if (_game & GF_WIN && !(ConfMan.getBool("native_mt32") && (_midiDriver != MD_MT32))) {
midi.loadMultipleSMF (_game_file);
} else {
midi.loadXMIDI (_game_file);