aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2005-04-08 06:25:57 +0000
committerTravis Howell2005-04-08 06:25:57 +0000
commitf04f741b8bd8d3dcbd2819c945c3e9adb6a043b9 (patch)
tree610362a9af50717bb57723bd692a407eb6eb2774
parent5bd6380b20babe5b949759c2527b5b5b554b1f80 (diff)
downloadscummvm-rg350-f04f741b8bd8d3dcbd2819c945c3e9adb6a043b9.tar.gz
scummvm-rg350-f04f741b8bd8d3dcbd2819c945c3e9adb6a043b9.tar.bz2
scummvm-rg350-f04f741b8bd8d3dcbd2819c945c3e9adb6a043b9.zip
Change from Quietust:
-Fix inventory in NES version of maniac svn-id: r17447
-rw-r--r--scumm/object.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index e0a4b32928..9883b3e546 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -373,6 +373,10 @@ int ScummEngine::findObject(int x, int y) {
}
} while ((_objs[b].state & mask) == a);
}
+
+ if ((_features & GF_NES) && (v2_mouseover_box != -1))
+ return findInventory(VAR(VAR_EGO), v2_mouseover_box + _inventoryOffset + 1);
+
return 0;
}