aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/tattoo
diff options
context:
space:
mode:
authorPaul Gilbert2015-09-21 20:00:30 -0400
committerPaul Gilbert2015-09-21 20:00:30 -0400
commitb439cf75b54df7648d207e7e587b56043920f732 (patch)
treea7873640aedcd85531c11168d3fecf026b65105c /engines/sherlock/tattoo
parent3acf884126a4b0d94f418b39e62c533d695ec1bf (diff)
downloadscummvm-rg350-b439cf75b54df7648d207e7e587b56043920f732.tar.gz
scummvm-rg350-b439cf75b54df7648d207e7e587b56043920f732.tar.bz2
scummvm-rg350-b439cf75b54df7648d207e7e587b56043920f732.zip
SHERLOCK: RT: Remove redundant voices check when showing look dialogs
Diffstat (limited to 'engines/sherlock/tattoo')
-rw-r--r--engines/sherlock/tattoo/tattoo_user_interface.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index da4a277ba3..139497a8a4 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -514,11 +514,9 @@ void TattooUserInterface::doStandardControl() {
void TattooUserInterface::doLookControl() {
Events &events = *_vm->_events;
TattooScene &scene = *(TattooScene *)_vm->_scene;
- Sound &sound = *_vm->_sound;
- // See if a mouse button was released or a key pressed, and we want to initiate an action
- // TODO: Not sure about _soundOn.. should be check for speaking voice for text being complete
- if (events._released || events._rightReleased || _keyState.keycode || (sound._voices && !sound._soundOn)) {
+ // See if a mouse button was released or a key pressed to close the active look dialog
+ if (events._released || events._rightReleased || _keyState.keycode) {
// See if we were looking at an inventory object
if (!_invLookFlag) {
// See if there is any more text to display