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

athrxx at users.sourceforge.net athrxx at users.sourceforge.net
Mon Jun 28 19:03:04 CEST 2010


Revision: 50452
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50452&view=rev
Author:   athrxx
Date:     2010-06-28 17:03:04 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
KYRA: change audio detection flags setting (since most users don't own a real mt-32/lapc1/cm32l/cm64 device and our emulator is incomplete)

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

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2010-06-28 16:56:15 UTC (rev 50451)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2010-06-28 17:03:04 UTC (rev 50452)
@@ -105,8 +105,11 @@
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
 
 	if (!_flags.useDigSound) {
-		// We prefer AdLib over MIDI, since generally AdLib is better supported
-		MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_PCSPK | MDT_MIDI | MDT_ADLIB | MDT_PREFER_MT32);
+		// 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));
 
 		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.




More information about the Scummvm-git-logs mailing list