[Scummvm-cvs-logs] scummvm master -> b439cf75b54df7648d207e7e587b56043920f732

[dreammaster]

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:
b439cf75b5 SHERLOCK: RT: Remove redundant voices check when showing look dialogs


Commit: b439cf75b54df7648d207e7e587b56043920f732
    https://github.com/scummvm/scummvm/commit/b439cf75b54df7648d207e7e587b56043920f732
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-09-21T20:00:30-04:00

Commit Message:
SHERLOCK: RT: Remove redundant voices check when showing look dialogs

Changed paths:
    engines/sherlock/tattoo/tattoo_user_interface.cpp



diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index da4a277..139497a 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