diff options
Diffstat (limited to 'engines/sherlock/tattoo')
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_talk.cpp | 3 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_user_interface.cpp | 4 |
2 files changed, 3 insertions, 4 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 diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp index 275ba2f0a0..f9d6194a84 100644 --- a/engines/sherlock/tattoo/tattoo_user_interface.cpp +++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp @@ -132,14 +132,14 @@ void TattooUserInterface::lookAtObject() { while ((*p == ' ') || (*p == '=')) ++p; - // If it's not "NONE", play the Sound File + // If it's not "NONE", play the speech File Common::String soundName(p); if (soundName.compareToIgnoreCase("NONE")) { soundName.toLowercase(); if (!soundName.contains('.')) soundName += ".wav"; - sound.playSound(soundName, WAIT_RETURN_IMMEDIATELY); + sound.playSpeech(soundName); } break; |