[Scummvm-cvs-logs] scummvm master -> 336abef4012d359759a607f10138352cdae514c7
dreammaster
dreammaster at scummvm.org
Thu Aug 13 03:14:23 CEST 2015
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:
336abef401 SHERLOCK: RT: Fix voice-only conversations when subtitles are off
Commit: 336abef4012d359759a607f10138352cdae514c7
https://github.com/scummvm/scummvm/commit/336abef4012d359759a607f10138352cdae514c7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-12T21:13:26-04:00
Commit Message:
SHERLOCK: RT: Fix voice-only conversations when subtitles are off
Changed paths:
engines/sherlock/tattoo/tattoo_talk.cpp
diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
index 9aa1390..731e3a0 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);
More information about the Scummvm-git-logs
mailing list