diff options
Diffstat (limited to 'engines/kyra/kyra_v1.cpp')
| -rw-r--r-- | engines/kyra/kyra_v1.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index f5b96410e8..3a5d21196b 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -65,6 +65,7 @@ KyraEngine_v1::KyraEngine_v1(OSystem *system, const GameFlags &flags) _gameToLoad = -1; _mouseState = -1; + _updateHandItemCursor = false; _deathHandler = -1; memset(_flagsTable, 0, sizeof(_flagsTable)); @@ -128,10 +129,11 @@ Common::Error KyraEngine_v1::init() { _sound = new SoundAdLibPC(this, _mixer); } else { Sound::kType type; + const MusicType midiType = MidiDriver::getMusicType(dev); - if (MidiDriver::getMusicType(dev) == MT_PCSPK) + if (midiType == MT_PCSPK || midiType == MT_NULL) type = Sound::kPCSpkr; - else if (MidiDriver::getMusicType(dev) == MT_MT32 || ConfMan.getBool("native_mt32")) + else if (midiType == MT_MT32 || ConfMan.getBool("native_mt32")) type = Sound::kMidiMT32; else type = Sound::kMidiGM; |