[Scummvm-cvs-logs] scummvm master -> 23aba271ff54fff1abf8c4d5680961954762ca29

[dreammaster]

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:
23aba271ff SHERLOCK: RT: Fix setting up speech file to use during cutscenes


Commit: 23aba271ff54fff1abf8c4d5680961954762ca29
    https://github.com/scummvm/scummvm/commit/23aba271ff54fff1abf8c4d5680961954762ca29
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-14T20:54:39-04:00

Commit Message:
SHERLOCK: RT: Fix setting up speech file to use during cutscenes

Changed paths:
    engines/sherlock/talk.cpp
    engines/sherlock/tattoo/tattoo.cpp



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 7811aa3..549ad4f 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -141,6 +141,7 @@ void Talk::talkTo(const Common::String &filename) {
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
+	Sound &sound = *_vm->_sound;
 	UserInterface &ui = *_vm->_ui;
 	Common::Rect savedBounds = screen.getDisplayBounds();
 	bool abortFlag = false;
@@ -339,6 +340,10 @@ void Talk::talkTo(const Common::String &filename) {
 			_scriptSelect = select;
 			_speaker = _talkTo;
 
+			// Set up the talk file extension
+			if (IS_ROSE_TATTOO && sound._speechOn && _scriptMoreFlag != 1)
+				sound._talkSoundFile += Common::String::format("%02dB", select + 1);
+
 			// Make a copy of the statement (in case the script frees the statement list), and then execute it
 			Statement statement = _statements[select];
 			doScript(_statements[select]._reply);
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index 54301e4..82963cd 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -183,7 +183,7 @@ void TattooEngine::loadConfig() {
 	SherlockEngine::loadConfig();
 
 	_transparentMenus = ConfMan.getBool("transparent_windows");
-	_textWindowsOn = ConfMan.getBool("subtitles");
+	_textWindowsOn = ConfMan.getBool("subtitles") || !_sound->_speechOn;
 }
 
 void TattooEngine::saveConfig() {