[Scummvm-cvs-logs] scummvm master -> 14f163bad19927093bdcf2eeeaf36dd9129833ac

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
14f163bad1 SCI32: Allow kListAt to reference an empty list


Commit: 14f163bad19927093bdcf2eeeaf36dd9129833ac
    https://github.com/scummvm/scummvm/commit/14f163bad19927093bdcf2eeeaf36dd9129833ac
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-08-23T14:26:59+03:00

Commit Message:
SCI32: Allow kListAt to reference an empty list

Happens in Torin when examining Di's locket in chapter 3

Changed paths:
    engines/sci/engine/klists.cpp



diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp
index 91a0484..e780d3c 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);