aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound
diff options
context:
space:
mode:
authorColin Snover2017-01-18 21:38:07 -0600
committerColin Snover2017-03-30 19:46:27 -0500
commit4d062fc7a0157f2044f3ab69c7487a841babadeb (patch)
tree62eb50b0a2c1a9e3ed2cd0fcd39fd08cf8ac15d3 /engines/sci/sound
parente74adcec5263027fd623967da091b971e85146c1 (diff)
downloadscummvm-rg350-4d062fc7a0157f2044f3ab69c7487a841babadeb.tar.gz
scummvm-rg350-4d062fc7a0157f2044f3ab69c7487a841babadeb.tar.bz2
scummvm-rg350-4d062fc7a0157f2044f3ab69c7487a841babadeb.zip
SCI32: Do not default to General MIDI for SCI2.1 games
The only SCI32 game that uses MIDI and does not support AdLib is MGDX, and it its MIDI playback is currently broken regardless of the synth setting.
Diffstat (limited to 'engines/sci/sound')
-rw-r--r--engines/sci/sound/music.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index f78f1466af..1808cf367f 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -70,10 +70,9 @@ void SciMusic::init() {
Common::Platform platform = g_sci->getPlatform();
uint32 deviceFlags = MDT_PCSPK | MDT_PCJR | MDT_ADLIB | MDT_MIDI;
- // Default to MIDI in SCI2.1+ games, as many don't have AdLib support.
- // Also, default to MIDI for Windows versions of SCI1.1 games, as their
+ // Default to MIDI for Windows versions of SCI1.1 games, as their
// soundtrack is written for GM.
- if (getSciVersion() >= SCI_VERSION_2_1_EARLY || g_sci->_features->useAltWinGMSound())
+ if (g_sci->_features->useAltWinGMSound())
deviceFlags |= MDT_PREFER_GM;
// Currently our CMS implementation only supports SCI1(.1)