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

[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:
c87a73f9fd SHERLOCK: RT: Add missing verb filter for actions starting with '*'


Commit: c87a73f9fd5ebd6039a17a43c59c661e8b976ca8
    https://github.com/scummvm/scummvm/commit/c87a73f9fd5ebd6039a17a43c59c661e8b976ca8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-22T21:51:28-04:00

Commit Message:
SHERLOCK: RT: Add missing verb filter for actions starting with '*'

This fixes '*Solve' appearing as an option in the right click
menu for the Foolscap before you pick it up

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



diff --git a/engines/sherlock/tattoo/widget_verbs.cpp b/engines/sherlock/tattoo/widget_verbs.cpp
index 975d540..0b523a9 100644
--- a/engines/sherlock/tattoo/widget_verbs.cpp
+++ b/engines/sherlock/tattoo/widget_verbs.cpp
@@ -90,10 +90,10 @@ void WidgetVerbs::load(bool objectsOn) {
 
 			// Add any extra active verbs from the object's verb list
 			for (int idx = 0; idx < 6; ++idx) {
-				if (!ui._bgShape->_use[idx]._verb.empty() && !ui._bgShape->_use[idx]._verb.hasPrefix(" ") &&
-						(ui._bgShape->_use[idx]._target.empty() || ui._bgShape->_use[idx]._target.hasPrefix("*") ||
-						ui._bgShape->_use[idx]._target.hasPrefix(" "))) {
-					_verbCommands.push_back(ui._bgShape->_use[idx]._verb);
+				UseType &use = ui._bgShape->_use[idx];
+				if (!use._verb.empty() && !use._verb.hasPrefix(" ") && !use._verb.hasPrefix("*") &&
+					(use._target.empty() || use._target.hasPrefix("*") || use._target.hasPrefix(" "))) {
+					_verbCommands.push_back(use._verb);
 				}
 			}
 		}