diff options
| author | Paul Gilbert | 2015-08-14 20:54:39 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-08-14 20:54:39 -0400 |
| commit | 23aba271ff54fff1abf8c4d5680961954762ca29 (patch) | |
| tree | 069c7143698efb115531d4abea8b8cd9cc50d255 | |
| parent | 29d10d14972bd1ca0463ec555e01b845f387b3d4 (diff) | |
| download | scummvm-rg350-23aba271ff54fff1abf8c4d5680961954762ca29.tar.gz scummvm-rg350-23aba271ff54fff1abf8c4d5680961954762ca29.tar.bz2 scummvm-rg350-23aba271ff54fff1abf8c4d5680961954762ca29.zip | |
SHERLOCK: RT: Fix setting up speech file to use during cutscenes
| -rw-r--r-- | engines/sherlock/talk.cpp | 5 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index 7811aa3b55..549ad4fa5e 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 54301e4e85..82963cd953 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() { |