diff options
| author | Johannes Schickel | 2009-05-27 14:44:26 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-05-27 14:44:26 +0000 |
| commit | ac6c99eff0f8ca155d6b2fa160eeb667395a46fa (patch) | |
| tree | 1d5e5825b1def046c702d69a3e7efb8ddbf4dbb2 /engines | |
| parent | 2bcf5c0552cf0778eb2642608134c6c0e4f3028e (diff) | |
| download | scummvm-rg350-ac6c99eff0f8ca155d6b2fa160eeb667395a46fa.tar.gz scummvm-rg350-ac6c99eff0f8ca155d6b2fa160eeb667395a46fa.tar.bz2 scummvm-rg350-ac6c99eff0f8ca155d6b2fa160eeb667395a46fa.zip | |
Prevent accidental MT-32 initialization for PC speaker output, when "native_mt32" is set to true.
svn-id: r40940
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/kyra/kyra_v1.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index d5e0308a09..aaecef5a09 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -121,10 +121,10 @@ Common::Error KyraEngine_v1::init() { } else { Sound::kType type; - if (midiDriver == MD_MT32 || ConfMan.getBool("native_mt32")) - type = Sound::kMidiMT32; - else if (midiDriver == MD_PCSPK) + if (midiDriver == MD_PCSPK) type = Sound::kPCSpkr; + else if (midiDriver == MD_MT32 || ConfMan.getBool("native_mt32")) + type = Sound::kMidiMT32; else type = Sound::kMidiGM; |