[Scummvm-cvs-logs] SF.net SVN: scummvm:[53926] scummvm/trunk/engines/kyra

[athrxx at users.sourceforge.net]

Revision: 53926
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53926&view=rev
Author:   athrxx
Date:     2010-10-29 18:57:19 +0000 (Fri, 29 Oct 2010)

Log Message:
-----------
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.)

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/items_lol.cpp
    scummvm/trunk/engines/kyra/kyra_v1.cpp

Modified: scummvm/trunk/engines/kyra/items_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/items_lol.cpp	2010-10-29 16:54:10 UTC (rev 53925)
+++ scummvm/trunk/engines/kyra/items_lol.cpp	2010-10-29 18:57:19 UTC (rev 53926)
@@ -154,7 +154,7 @@
 			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;

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2010-10-29 16:54:10 UTC (rev 53925)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2010-10-29 18:57:19 UTC (rev 53926)
@@ -103,11 +103,10 @@
 	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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.