From c87a73f9fd5ebd6039a17a43c59c661e8b976ca8 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 22 Aug 2015 21:51:28 -0400 Subject: 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 --- engines/sherlock/tattoo/widget_verbs.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/sherlock/tattoo/widget_verbs.cpp') diff --git a/engines/sherlock/tattoo/widget_verbs.cpp b/engines/sherlock/tattoo/widget_verbs.cpp index 975d540053..0b523a93e9 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); } } } -- cgit v1.2.3