[Scummvm-cvs-logs] scummvm master -> 9de412c4ff79805d558fe166609dbc4d9295d313

[m-kiewitz]

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:
9de412c4ff SCI: sci.cpp updated b/c KQ6 audio+text support


Commit: 9de412c4ff79805d558fe166609dbc4d9295d313
    https://github.com/scummvm/scummvm/commit/9de412c4ff79805d558fe166609dbc4d9295d313
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2013-12-08T05:55:06-08:00

Commit Message:
SCI: sci.cpp updated b/c KQ6 audio+text support

Changed paths:
    engines/sci/sci.cpp



diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 69a7c0b..5fd4fc1 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -913,13 +913,12 @@ void SciEngine::syncIngameAudioOptions() {
 			case GID_FREDDYPHARKAS:
 			case GID_ECOQUEST:
 			case GID_LSL6:
-				// TODO: The following need script patches for simultaneous speech and subtitles
-				//  GID_KQ6
 				_gamestate->variables[VAR_GLOBAL][90] = make_reg(0, 3);	// speech + subtitles
 				break;
 			case GID_LAURABOW2:
-				// Laura Bow 2 gets patched when speech and subtitles are enabled
-				//  It then does both, when the user has "speech" selected. That's why we select speech here
+			case GID_KQ6:
+				// Laura Bow 2 + King's Quest 6 get patched when speech and subtitles are enabled
+				//  When the user has "speech" selected, the game will then do both That's why we select speech here
 			default:
 				// Game does not support speech and subtitles, set it to speech
 				_gamestate->variables[VAR_GLOBAL][90] = make_reg(0, 2);	// speech
@@ -946,6 +945,7 @@ void SciEngine::updateScummVMAudioOptions() {
 			// speech
 			switch (_gameId) {
 			case GID_LAURABOW2:
+			case GID_KQ6:
 				// We don't sync "speech" for Laura Bow 2 in case the user choose "both" in the setting
 				//  Because "speech" (2) within SCI means "speech + subtitles" for Laura Bow 2
 				if (subtitlesOn && speechOn)