[Scummvm-cvs-logs] scummvm master -> 1117c8c3ed82315da58b695e1975db84500659b0

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1117c8c3ed SCI: Also default to MIDI for Windows versions of SCI1.1 games


Commit: 1117c8c3ed82315da58b695e1975db84500659b0
    https://github.com/scummvm/scummvm/commit/1117c8c3ed82315da58b695e1975db84500659b0
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-10-06T13:33:00-07:00

Commit Message:
SCI: Also default to MIDI for Windows versions of SCI1.1 games

Changed paths:
    engines/sci/sound/music.cpp



diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 2afab38..9610b6f 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -63,12 +63,13 @@ void SciMusic::init() {
 	// SCI sound init
 	_dwTempo = 0;
 
-	// Default to MIDI in SCI2.1+ games, as many don't have AdLib support.
 	Common::Platform platform = g_sci->getPlatform();
-
 	uint32 deviceFlags = MDT_PCSPK | MDT_PCJR | MDT_ADLIB | MDT_MIDI;
 
-	if (getSciVersion() >= SCI_VERSION_2_1)
+	// 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
+	// soundtrack is written for GM.
+	if (getSciVersion() >= SCI_VERSION_2_1 || g_sci->_features->useAltWinGMSound())
 		deviceFlags |= MDT_PREFER_GM;
 
 	// Currently our CMS implementation only supports SCI1(.1)