diff options
| author | Eugene Sandulenko | 2005-04-08 15:14:49 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-04-08 15:14:49 +0000 |
| commit | b8385b0af1b7e25e9d9f64c2c1fff5403a407ce7 (patch) | |
| tree | 7800e924a38a8ed015d012095b9a4b492f927f56 | |
| parent | 00a7b8c1ff226db4cd4016f4a0951a29c6842ae0 (diff) | |
| download | scummvm-rg350-b8385b0af1b7e25e9d9f64c2c1fff5403a407ce7.tar.gz scummvm-rg350-b8385b0af1b7e25e9d9f64c2c1fff5403a407ce7.tar.bz2 scummvm-rg350-b8385b0af1b7e25e9d9f64c2c1fff5403a407ce7.zip | |
Patch from Quietust.
Do not let invenotry arrows in MM NES trigger inventory script
svn-id: r17453
| -rw-r--r-- | scumm/object.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 9883b3e546..f5d6caf65a 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -374,7 +374,8 @@ int ScummEngine::findObject(int x, int y) { } while ((_objs[b].state & mask) == a); } - if ((_features & GF_NES) && (v2_mouseover_box != -1)) + if ((_features & GF_NES) && (_userState & 0x40) && (v2_mouseover_box >= 0) && + (v2_mouseover_box < 4)) return findInventory(VAR(VAR_EGO), v2_mouseover_box + _inventoryOffset + 1); return 0; |