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

dreammaster dreammaster at scummvm.org
Sun Jul 19 21:02:30 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:
bc9da9c14d SHERLOCK: RT: Fix loading of inventory verb list secondary actions


Commit: bc9da9c14decc93fe5a70189426bd6f8600db2d8
    https://github.com/scummvm/scummvm/commit/bc9da9c14decc93fe5a70189426bd6f8600db2d8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-19T15:01:35-04:00

Commit Message:
SHERLOCK: RT: Fix loading of inventory verb list secondary actions

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



diff --git a/engines/sherlock/tattoo/widget_inventory.cpp b/engines/sherlock/tattoo/widget_inventory.cpp
index 241eaca..a62efcd 100644
--- a/engines/sherlock/tattoo/widget_inventory.cpp
+++ b/engines/sherlock/tattoo/widget_inventory.cpp
@@ -275,7 +275,7 @@ void WidgetInventoryVerbs::load() {
 
 		if (obj._type != INVALID && obj._type != HIDDEN) {
 			for (int useNum = 0; useNum < 6; ++useNum) {
-				if (obj._use[useNum]._verb.hasPrefix("*") &&
+				if (!obj._use[useNum]._verb.hasPrefix("*") &&
 					!obj._use[useNum]._target.compareToIgnoreCase(inv[_owner->_invSelect]._name)) {
 					// Make sure the Verb is not already in the list
 					bool found1 = false;






More information about the Scummvm-git-logs mailing list