diff options
| author | Florian Kagerer | 2010-10-29 19:00:37 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2010-10-29 19:00:37 +0000 |
| commit | c9442e26ad70fa18dbcee3814ca586e2bc45bdf8 (patch) | |
| tree | 063ab426ecfcbab6fd312883b2959632861252d9 | |
| parent | 67566890bd07256e56ed113e5b0df1f1a9f76112 (diff) | |
| download | scummvm-rg350-c9442e26ad70fa18dbcee3814ca586e2bc45bdf8.tar.gz scummvm-rg350-c9442e26ad70fa18dbcee3814ca586e2bc45bdf8.tar.bz2 scummvm-rg350-c9442e26ad70fa18dbcee3814ca586e2bc45bdf8.zip | |
KYRA: match music settings with latest launcher code changes.
(Last commit got trunkated somehow)
svn-id: r53927
| -rw-r--r-- | engines/kyra/kyra_v1.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 7bb78f24a7..26c4001578 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -103,9 +103,13 @@ Common::Error KyraEngine_v1::init() { syncSoundSettings(); if (!_flags.useDigSound) { - // In Kyra 1 users who have specified a MT-32 device in the launcher settings + // In Kyra 1 users who have specified a default 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. + // default GM device in the launcher will get GM music, otherwise AdLib. Users who want + // MT-32 music in Kyra2 or LoL have to select this individually (since we assume that + // most users rather have a GM device than a MT-32 device). + // Users who want PC speaker sound always have to select this individually for all + // Kyra games. 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) { |