diff options
| author | Torbjörn Andersson | 2006-10-02 21:38:39 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2006-10-02 21:38:39 +0000 |
| commit | bcd4591da43f8d5f67142cbd8034910be7be0493 (patch) | |
| tree | aa12209f0b0a1b792e5f5f35c4428a0296907873 | |
| parent | 51010bd038119dc98356b442c8f30b8e486aa5c2 (diff) | |
| download | scummvm-rg350-bcd4591da43f8d5f67142cbd8034910be7be0493.tar.gz scummvm-rg350-bcd4591da43f8d5f67142cbd8034910be7be0493.tar.bz2 scummvm-rg350-bcd4591da43f8d5f67142cbd8034910be7be0493.zip | |
Workaround for bug #1555938 ("MI2: Inventory object cloning"), as suggested by
Fingolfin.
svn-id: r24080
| -rw-r--r-- | engines/scumm/script.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp index 537a736fee..707bf719f4 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -150,6 +150,13 @@ int ScummEngine::getVerbEntrypoint(int obj, int entry) { const byte *objptr, *verbptr; int verboffs; + // WORKAROUND for bug #1555938: Disallow pulling the rope if it's + // already in the player's inventory. + + if (_game.id == GID_MONKEY2 && obj == 1047 && entry == 6 && whereIsObject(obj) == WIO_INVENTORY) { + return 0; + } + if (whereIsObject(obj) == WIO_NOT_FOUND) return 0; |