aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-08-01 13:42:33 +0000
committerTorbjörn Andersson2006-08-01 13:42:33 +0000
commit7d53480025b1c314327a523ddb261fb20fe96157 (patch)
treec61a2b57e315943ae05a7095eb46dfc94359e516 /engines/kyra/kyra.cpp
parent56c59d1da660f57d682579dd9e14bea2da6b0c76 (diff)
downloadscummvm-rg350-7d53480025b1c314327a523ddb261fb20fe96157.tar.gz
scummvm-rg350-7d53480025b1c314327a523ddb261fb20fe96157.tar.bz2
scummvm-rg350-7d53480025b1c314327a523ddb261fb20fe96157.zip
Kyra 2 has two types of XMIDI files: XMI and C55. It seems C55 are for the
General MIDI instrument set, so use them unless we're in MT-32 mode. This makes the music sound a bit closer (at least to me) to what DOSbox plays. svn-id: r23653
Diffstat (limited to 'engines/kyra/kyra.cpp')
-rw-r--r--engines/kyra/kyra.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp
index b650aa61c5..bee1368be6 100644
--- a/engines/kyra/kyra.cpp
+++ b/engines/kyra/kyra.cpp
@@ -160,10 +160,13 @@ int KyraEngine::init() {
_sound = soundMidiPc;
assert(_sound);
soundMidiPc->hasNativeMT32(native_mt32);
+
+ // C55 appears to be XMIDI for General MIDI instruments
+ soundMidiPc->setUseC55(_game == GI_KYRA2 && !native_mt32);
// Unlike some SCUMM games, it's not that the MIDI sounds are
// missing. It's just that at least at the time of writing they
- // decidedly inferior to the Adlib ones.
+ // are decidedly inferior to the Adlib ones.
if (midiDriver != MD_ADLIB && ConfMan.getBool("multi_midi")) {
SoundAdlibPC *adlib = new SoundAdlibPC(_mixer, this);