From 67566890bd07256e56ed113e5b0df1f1a9f76112 Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Fri, 29 Oct 2010 18:57:19 +0000
Subject: 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
---
 engines/kyra/kyra_v1.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'engines/kyra/kyra_v1.cpp')

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)
-- 
cgit v1.2.3