libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 13:13:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Paul Gilbert 2015-08-14 20:54:39 -04:00
parent 29d10d1497
commit 23aba271ff
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/sherlock/talk.cpp
View File

@ -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);

2
engines/sherlock/tattoo/tattoo.cpp
View File

@ -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() {