diff options
Diffstat (limited to 'engines/sherlock/tattoo/tattoo_talk.cpp')
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_talk.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp index ddd863fea4..d16e26fcea 100644 --- a/engines/sherlock/tattoo/tattoo_talk.cpp +++ b/engines/sherlock/tattoo/tattoo_talk.cpp @@ -25,7 +25,7 @@ #include "sherlock/tattoo/tattoo_people.h" #include "sherlock/tattoo/tattoo_scene.h" #include "sherlock/tattoo/tattoo_user_interface.h" -#include "sherlock/sherlock.h" +#include "sherlock/tattoo/tattoo.h" #include "sherlock/screen.h" namespace Sherlock { @@ -184,9 +184,15 @@ TattooTalk::TattooTalk(SherlockEngine *vm) : Talk(vm), _talkWidget(vm), _passwor } void TattooTalk::talkInterface(const byte *&str) { + TattooEngine &vm = *(TattooEngine *)_vm; + Sound &sound = *_vm->_sound; + Talk &talk = *_vm->_talk; TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui; const byte *s = str; + if (!vm._textWindowsOn && sound._speechOn && talk._speaker != -1) + return; + // Move to past the end of the text string _charCount = 0; while ((*str < TATTOO_OPCODES[0] || *str == TATTOO_OPCODES[OP_NULL]) && *str) { |