diff options
| author | Filippos Karapetis | 2009-03-11 23:47:00 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-03-11 23:47:00 +0000 |
| commit | 26135a175cf94084cb8bc259e0389b33c01086c7 (patch) | |
| tree | 4ebb99595aa8de100ea10df90a14fdfe182bd64c | |
| parent | 966972def67485b51e2e59958af4a3ab6a3ffefd (diff) | |
| download | scummvm-rg350-26135a175cf94084cb8bc259e0389b33c01086c7.tar.gz scummvm-rg350-26135a175cf94084cb8bc259e0389b33c01086c7.tar.bz2 scummvm-rg350-26135a175cf94084cb8bc259e0389b33c01086c7.zip | |
Changed a case inside inline_lookup_node() to non-fatal, for now, to make it possible to walk around in SQ4 (check the FIXME comment)
svn-id: r39348
| -rw-r--r-- | engines/sci/engine/klists.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp index ecfd64a88d..a3e0cc0baa 100644 --- a/engines/sci/engine/klists.cpp +++ b/engines/sci/engine/klists.cpp @@ -42,8 +42,11 @@ inline Node *inline_lookup_node(EngineState *s, reg_t addr, const char *file, in mobj = GET_SEGMENT(*s->seg_manager, addr.segment, MEM_OBJ_NODES); if (!mobj) { - sciprintf("%s, L%d: Attempt to use non-node "PREG" as list node\n", __FILE__, __LINE__, PRINT_REG(addr)); - script_debug_flag = script_error_flag = 1; + // FIXME: This occurs right at the beginning of SQ4, when walking north from the first screen. It doesn't + // seem to have any apparent ill-effects, though, so it's been changed to non-fatal, for now + //sciprintf("%s, L%d: Attempt to use non-node "PREG" as list node\n", __FILE__, __LINE__, PRINT_REG(addr)); + //script_debug_flag = script_error_flag = 1; + SCIkwarn(SCIkERROR, "%s, L%d: Attempt to use non-node "PREG" as list node\n", __FILE__, __LINE__, PRINT_REG(addr)); return NULL; } |