[Scummvm-cvs-logs] scummvm master -> 0b53820dd91175ff639dd56b4a5e45c99a869dc5

dreammaster dreammaster at scummvm.org
Sat Aug 8 05:21:44 CEST 2015


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:
0b53820dd9 SHERLOCK: RT: Fix showing verbs with * prefixed target actions


Commit: 0b53820dd91175ff639dd56b4a5e45c99a869dc5
    https://github.com/scummvm/scummvm/commit/0b53820dd91175ff639dd56b4a5e45c99a869dc5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-07T23:20:48-04:00

Commit Message:
SHERLOCK: RT: Fix showing verbs with * prefixed target actions

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 7c9f723..fd9d1ed 100644
--- a/engines/sherlock/tattoo/widget_verbs.cpp
+++ b/engines/sherlock/tattoo/widget_verbs.cpp
@@ -91,7 +91,8 @@ 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.empty() || ui._bgShape->_use[idx]._target.hasPrefix("*") ||
+						ui._bgShape->_use[idx]._target.hasPrefix(" "))) {
 					_verbCommands.push_back(ui._bgShape->_use[idx]._verb);
 				}
 			}






More information about the Scummvm-git-logs mailing list