[Scummvm-cvs-logs] SF.net SVN: scummvm:[51157] scummvm/trunk/engines/sci/graphics/animate.cpp

[thebluegr at users.sourceforge.net]

Revision: 51157
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51157&view=rev
Author:   thebluegr
Date:     2010-07-22 18:14:43 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
SCI: Remove sanity check introduced in rev 51154. When a node is deleted via kDeleteKey, the successor is set to NULL, thus list processing stops (which is what SSCI is doing).

Revision Links:
--------------
    http://scummvm.svn.sourceforge.net/scummvm/?rev=51154&view=rev

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/animate.cpp

Modified: scummvm/trunk/engines/sci/graphics/animate.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.cpp	2010-07-22 18:13:05 UTC (rev 51156)
+++ scummvm/trunk/engines/sci/graphics/animate.cpp	2010-07-22 18:14:43 UTC (rev 51157)
@@ -91,8 +91,6 @@
 
 		signal = readSelectorValue(_s->_segMan, curObject, SELECTOR(signal));
 		if (!(signal & kSignalFrozen)) {
-			reg_t nextNode = curNode->succ;
-
 			// Call .doit method of that object
 			invokeSelector(_s, curObject, SELECTOR(doit), argc, argv, 0);
 
@@ -103,11 +101,9 @@
 			// Lookup node again, since the nodetable it was in may have been reallocated.
 			// The node might have been deallocated at this point (e.g. LSL2, room 42),
 			// in which case the node reference will be null and the loop will stop below.
+			// If the node is deleted from kDeleteKey, it won't have a successor node, thus
+			// list processing will stop here (which is what SSCI does).
 			curNode = _s->_segMan->lookupNode(curAddress, false);
-			
-			// Sanity check: If the node has been deleted, it shouldn't have a successor node
-			if (!curNode && !nextNode.isNull())
-				error("kAnimate: list node has been deleted, but it has a successor node");
 		}
 
 		if (curNode) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.