aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/tattoo/tattoo_talk.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-08-11 20:30:04 -0400
committerPaul Gilbert2015-08-11 20:30:04 -0400
commit237d1149b5ab8cd00baa902ad951a01889383362 (patch)
tree836b2a758dcaaeb52cb3352a27f125ffc39804e9 /engines/sherlock/tattoo/tattoo_talk.cpp
parent4ad53dced0e6031f9f634e50dd7bae96b8d7f0f1 (diff)
downloadscummvm-rg350-237d1149b5ab8cd00baa902ad951a01889383362.tar.gz
scummvm-rg350-237d1149b5ab8cd00baa902ad951a01889383362.tar.bz2
scummvm-rg350-237d1149b5ab8cd00baa902ad951a01889383362.zip
SHERLOCK: RT: Don't error out if a speech resource doesn't exist
Diffstat (limited to 'engines/sherlock/tattoo/tattoo_talk.cpp')
-rw-r--r--engines/sherlock/tattoo/tattoo_talk.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
index d16e26fcea..816e0e2b13 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -186,11 +186,10 @@ 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)
+ if (!vm._textWindowsOn && sound._speechOn && _speaker != -1)
return;
// Move to past the end of the text string