diff options
| author | Paul Gilbert | 2015-08-12 21:13:26 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-08-12 21:13:26 -0400 |
| commit | 336abef4012d359759a607f10138352cdae514c7 (patch) | |
| tree | 49dfabab3c60ecdd634d90b52968c14690e38ee4 /engines/sherlock | |
| parent | e6b070711a76f8cd4008d687d12eefaed231bed6 (diff) | |
| download | scummvm-rg350-336abef4012d359759a607f10138352cdae514c7.tar.gz scummvm-rg350-336abef4012d359759a607f10138352cdae514c7.tar.bz2 scummvm-rg350-336abef4012d359759a607f10138352cdae514c7.zip | |
SHERLOCK: RT: Fix voice-only conversations when subtitles are off
Diffstat (limited to 'engines/sherlock')
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_talk.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp index 9aa1390462..731e3a0e56 100644 --- a/engines/sherlock/tattoo/tattoo_talk.cpp +++ b/engines/sherlock/tattoo/tattoo_talk.cpp @@ -189,17 +189,18 @@ void TattooTalk::talkInterface(const byte *&str) { TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui; const byte *s = str; - _wait = 1; - if (!vm._textWindowsOn && sound._speechOn && _speaker != -1) - return; - // Move to past the end of the text string + _wait = 1; _charCount = 0; while ((*str < TATTOO_OPCODES[0] || *str == TATTOO_OPCODES[OP_NULL]) && *str) { ++_charCount; ++str; } + // If speech is on, and text windows (subtitles) are off, then don't show the text window + if (!vm._textWindowsOn && sound._speechOn && _speaker != -1) + return; + // Display the text window ui.banishWindow(); ui._textWidget.load(Common::String((const char *)s, (const char *)str), _speaker); |