diff options
| author | Filippos Karapetis | 2013-01-23 21:30:47 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2013-01-23 21:31:26 +0200 |
| commit | 0143a5d938fc314d19f2ddcac2192a49a790cb6a (patch) | |
| tree | 392bd340d16ee0023333bed0d0028d8115de7670 /engines | |
| parent | 5ba950c8a485ed212543e0e784517dbb12d418a1 (diff) | |
| download | scummvm-rg350-0143a5d938fc314d19f2ddcac2192a49a790cb6a.tar.gz scummvm-rg350-0143a5d938fc314d19f2ddcac2192a49a790cb6a.tar.bz2 scummvm-rg350-0143a5d938fc314d19f2ddcac2192a49a790cb6a.zip | |
SCI: Bugfix for commit 0968acc: only filter out missing messages for the jar
This is to properly fix bug #3601090 without removing any functionality.
The additional check ensures that the look and hand icons work with the
jar. Many thanks to lskovlun for debugging this and providing a fix
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/kstring.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp index 3838c68502..a6ef5be787 100644 --- a/engines/sci/engine/kstring.cpp +++ b/engines/sci/engine/kstring.cpp @@ -540,7 +540,8 @@ reg_t kMessage(EngineState *s, int argc, reg_t *argv) { // NOTE: To fix a corrupted jar object, type "send Glass_Jar message 52" // in the debugger. if (g_sci->getGameId() == GID_PEPPER && func == 0 && argc >= 6 && module == 894 && - tuple.noun == 26 && tuple.cond == 0 && tuple.seq == 1) + tuple.noun == 26 && tuple.cond == 0 && tuple.seq == 1 && + !s->_msgState->getMessage(module, tuple, NULL_REG)) tuple.verb = 0; switch (func) { |