[Scummvm-git-logs] scummvm master -> 42ebd5a66449121f8aa68f0e35f3f03b137ece63

[csnover]

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:
42ebd5a664 SCI32: Allow SCI32 games to update speech & subtitles settings


Commit: 42ebd5a66449121f8aa68f0e35f3f03b137ece63
    https://github.com/scummvm/scummvm/commit/42ebd5a66449121f8aa68f0e35f3f03b137ece63
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-11-03T13:14:58-05:00

Commit Message:
SCI32: Allow SCI32 games to update speech & subtitles settings

Fixes Trac#9637.

Changed paths:
    engines/sci/sci.cpp



diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 246c031..e89d052 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -1166,7 +1166,9 @@ void SciEngine::syncIngameAudioOptions() {
 void SciEngine::updateScummVMAudioOptions() {
 	// Update ScummVM's speech/subtitles settings for SCI1.1 CD games,
 	// depending on the in-game settings
-	if (isCD() && getSciVersion() == SCI_VERSION_1_1) {
+	if ((isCD() && getSciVersion() == SCI_VERSION_1_1) ||
+		getSciVersion() >= SCI_VERSION_2) {
+
 		uint16 ingameSetting = _gamestate->variables[VAR_GLOBAL][kGlobalVarMessageType].getOffset();
 
 		switch (ingameSetting) {