aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2016-08-23 14:26:59 +0300
committerFilippos Karapetis2016-08-23 14:26:59 +0300
commit14f163bad19927093bdcf2eeeaf36dd9129833ac (patch)
tree95c8e69bd27e47e2f0b804f98bcf225ee15fcf83
parentd15660e70df3675e26a7f89bc57c6c311803223a (diff)
downloadscummvm-rg350-14f163bad19927093bdcf2eeeaf36dd9129833ac.tar.gz
scummvm-rg350-14f163bad19927093bdcf2eeeaf36dd9129833ac.tar.bz2
scummvm-rg350-14f163bad19927093bdcf2eeeaf36dd9129833ac.zip
SCI32: Allow kListAt to reference an empty list
Happens in Torin when examining Di's locket in chapter 3
-rw-r--r--engines/sci/engine/klists.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp
index 91a0484703..e780d3cdc3 100644
--- a/engines/sci/engine/klists.cpp
+++ b/engines/sci/engine/klists.cpp
@@ -494,7 +494,7 @@ reg_t kListAt(EngineState *s, int argc, reg_t *argv) {
List *list = s->_segMan->lookupList(argv[0]);
reg_t curAddress = list->first;
if (list->first.isNull()) {
- error("kListAt tried to reference empty list (%04x:%04x)", PRINT_REG(argv[0]));
+ // Happens in Torin when examining Di's locket in chapter 3
return NULL_REG;
}
Node *curNode = s->_segMan->lookupNode(curAddress);