diff options
| author | Florian Kagerer | 2010-10-29 18:57:19 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2010-10-29 18:57:19 +0000 |
| commit | 67566890bd07256e56ed113e5b0df1f1a9f76112 (patch) | |
| tree | 6b8046a5f7a4423117fa3b456ee0c5f17fff4f43 | |
| parent | 1ed0051fcee19bca86cb352b077967a819dc5b46 (diff) | |
| download | scummvm-rg350-67566890bd07256e56ed113e5b0df1f1a9f76112.tar.gz scummvm-rg350-67566890bd07256e56ed113e5b0df1f1a9f76112.tar.bz2 scummvm-rg350-67566890bd07256e56ed113e5b0df1f1a9f76112.zip | |
KYRA: match music settings with latest launcher code changes.
(Users will get AdLib music at default unless they have specified a MIDI device in the launcher (MT-32 for KYRA, GM for HOF and LOL.)
svn-id: r53926
| -rw-r--r-- | engines/kyra/items_lol.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/kyra_v1.cpp | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/items_lol.cpp index 7ad9747bb6..e99f3bf701 100644 --- a/engines/kyra/items_lol.cpp +++ b/engines/kyra/items_lol.cpp @@ -154,7 +154,7 @@ Item LoLEngine::makeItem(int itemType, int curFrame, int flags) { deleteItem(r); slot = r; } else { - int ii = _itemsInPlay[slot].nextAssignedObject; + uint16 ii = _itemsInPlay[slot].nextAssignedObject; while (ii) { if (testUnkItemFlags(ii)) { _itemsInPlay[slot].nextAssignedObject = _itemsInPlay[ii].nextAssignedObject; diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 0eb418e0fe..7bb78f24a7 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -103,11 +103,10 @@ Common::Error KyraEngine_v1::init() { syncSoundSettings(); if (!_flags.useDigSound) { - // We prefer AdLib over MIDI in Kyra 1, since it offers MT-32 support only, most users don't have a real - // MT-32/LAPC1/CM32L/CM64 device and AdLib sounds better than our incomplete MT-32 emulator and also better than - // MT-32/GM mapping. For Kyra 2 and LoL which have real GM tracks which sound better than AdLib tracks we prefer GM - // since most users have a GM compatible device. - MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_PCSPK | MDT_MIDI | MDT_ADLIB | ((_flags.gameID == GI_KYRA2 || _flags.gameID == GI_LOL) ? MDT_PREFER_GM : 0)); + // In Kyra 1 users who have specified a MT-32 device in the launcher settings + // will get MT-32 music, otherwise AdLib. In Kyra 2 and LoL users who have specified a + // GM device in the launcher will get GM music, otherwise AdLib. + MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_PCSPK | MDT_MIDI | MDT_ADLIB | ((_flags.gameID == GI_KYRA2 || _flags.gameID == GI_LOL) ? MDT_PREFER_GM : MDT_PREFER_MT32)); if (_flags.platform == Common::kPlatformFMTowns) { if (_flags.gameID == GI_KYRA1) |