[Scummvm-cvs-logs] scummvm master -> ee1ef54f377fa959e05e365514201c44b7ed0c58
dreammaster
dreammaster at scummvm.org
Sat Oct 17 02:00:05 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:
ee1ef54f37 SHERLOCK: RT: Fix crash showing folder to Watson
Commit: ee1ef54f377fa959e05e365514201c44b7ed0c58
https://github.com/scummvm/scummvm/commit/ee1ef54f377fa959e05e365514201c44b7ed0c58
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-16T19:59:31-04:00
Commit Message:
SHERLOCK: RT: Fix crash showing folder to Watson
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 3555ecd..b49e30b 100644
--- a/engines/sherlock/tattoo/widget_inventory.cpp
+++ b/engines/sherlock/tattoo/widget_inventory.cpp
@@ -641,10 +641,12 @@ void WidgetInventory::handleEvents() {
bool found = false;
if (ui._bgFound != -1) {
if (ui._personFound) {
+ Person &person = people[ui._bgFound - 1000];
+
for (int idx = 0; idx < 2; ++idx) {
- if (!people[ui._bgFound - 1000]._use[idx]._verb.compareToIgnoreCase(_verb) &&
- !people[ui._bgFound - 1000]._use[idx]._target.compareToIgnoreCase(_invTarget)) {
- ui.checkAction(people[ui._bgFound - 1000]._use[idx], ui._bgFound);
+ if (!person._use[idx]._verb.compareToIgnoreCase(_verb) &&
+ !person._use[idx]._target.compareToIgnoreCase(_invTarget)) {
+ ui.checkAction(person._use[idx], ui._bgFound);
found = true;
}
}
More information about the Scummvm-git-logs
mailing list