diff options
author | Filippos Karapetis | 2010-06-24 07:32:34 +0000 |
---|---|---|
committer | Filippos Karapetis | 2010-06-24 07:32:34 +0000 |
commit | f65c4f988639b1ba5e6b2a95174aef3ec7fd8941 (patch) | |
tree | 6937676908a29a6bb8c137c42fc5d3f7c9855b6b /engines/sci/engine/segment.cpp | |
parent | 7c9cbf75c0ed6e66b5c7875f5e7657313b943a5c (diff) | |
download | scummvm-rg350-f65c4f988639b1ba5e6b2a95174aef3ec7fd8941.tar.gz scummvm-rg350-f65c4f988639b1ba5e6b2a95174aef3ec7fd8941.tar.bz2 scummvm-rg350-f65c4f988639b1ba5e6b2a95174aef3ec7fd8941.zip |
Changed an error in LocalVariables::dereference() back to a warning, as it occurs in 2 places during the intro of LB2 (called from kMemory(peek))
svn-id: r50202
Diffstat (limited to 'engines/sci/engine/segment.cpp')
-rw-r--r-- | engines/sci/engine/segment.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/sci/engine/segment.cpp b/engines/sci/engine/segment.cpp index 98f03ff18a..28cc03d175 100644 --- a/engines/sci/engine/segment.cpp +++ b/engines/sci/engine/segment.cpp @@ -464,7 +464,10 @@ SegmentRef LocalVariables::dereference(reg_t pointer) { if (ret.maxSize > 0) { ret.reg = &_locals[pointer.offset / 2]; } else { - error("LocalVariables::dereference: Offset at end or out of bounds %04x:%04x", PRINT_REG(pointer)); + // Happens in two places during the intro of LB2CD, both from kMemory(peek): + // - room 160: Heap 160 has 83 local variables (0-82), and the game asks for variables at indices 83 - 90 too + // - room 220: Heap 220 has 114 local variables (0-113), and the game asks for variables at indices 114-120 too + warning("LocalVariables::dereference: Offset at end or out of bounds %04x:%04x", PRINT_REG(pointer)); ret.reg = 0; } return ret; |