SCI: Fixed the crash in LSL2, room 42 (when arriving at the island). kAnimate may refer to unfrozen objects which have been deleted, thus handle that case accordingly.

svn-id: r51152

2 files changed, 5 insertions, 2 deletions

diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp
index ef2279e492..25cf1d069f 100644
--- a/engines/sci/engine/seg_manager.cpp
+++ b/engines/sci/engine/seg_manager.cpp
@@ -508,7 +508,7 @@ List *SegManager::lookupList(reg_t addr) {
 	return &(lt->_table[addr.offset]);
 }
 
-Node *SegManager::lookupNode(reg_t addr) {
+Node *SegManager::lookupNode(reg_t addr, bool stopOnDiscarded) {
 	if (addr.isNull())
 		return NULL; // Non-error null
 
@@ -522,6 +522,9 @@ Node *SegManager::lookupNode(reg_t addr) {
 	NodeTable *nt = (NodeTable *)_heap[addr.segment];
 
 	if (!nt->isValidEntry(addr.offset)) {
+		if (!stopOnDiscarded)
+			return NULL;
+
 		error("Attempt to use invalid or discarded reference %04x:%04x as list node", PRINT_REG(addr));
 		return NULL;
 	}
diff --git a/engines/sci/engine/seg_manager.h b/engines/sci/engine/seg_manager.h
index a7f5f8517f..e0808dbb1b 100644
--- a/engines/sci/engine/seg_manager.h
+++ b/engines/sci/engine/seg_manager.h
@@ -232,7 +232,7 @@ public:
 	 * @param addr The address to resolve
 	 * @return The list node referenced, or NULL on error
 	 */
-	Node *lookupNode(reg_t addr);
+	Node *lookupNode(reg_t addr, bool stopOnDiscarded = true);
 
 
 	// 8. Hunk Memory