[Scummvm-cvs-logs] SF.net SVN: scummvm:[53927] scummvm/trunk/engines/kyra/kyra_v1.cpp
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Fri Oct 29 21:00:38 CEST 2010
Revision: 53927
http://scummvm.svn.sourceforge.net/scummvm/?rev=53927&view=rev
Author: athrxx
Date: 2010-10-29 19:00:37 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
KYRA: match music settings with latest launcher code changes.
(Last commit got trunkated somehow)
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-10-29 18:57:19 UTC (rev 53926)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp 2010-10-29 19:00:37 UTC (rev 53927)
@@ -103,9 +103,13 @@
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) {
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