[Scummvm-cvs-logs] SF.net SVN: scummvm:[50960] scummvm/trunk/engines/sci/engine/klists.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 50960
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50960&view=rev
Author:   m_kiewitz
Date:     2010-07-17 13:27:07 +0000 (Sat, 17 Jul 2010)

Log Message:
-----------
SCI: added special case for iceman when plotting course inside isSaneNodePointer

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/klists.cpp

Modified: scummvm/trunk/engines/sci/engine/klists.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/klists.cpp	2010-07-17 12:57:05 UTC (rev 50959)
+++ scummvm/trunk/engines/sci/engine/klists.cpp	2010-07-17 13:27:07 UTC (rev 50960)
@@ -37,7 +37,12 @@
 		Node *node = segMan->lookupNode(addr);
 
 		if (!node) {
-			error("isSaneNodePointer: Node at %04x:%04x wasn't found", PRINT_REG(addr));
+			if ((g_sci->getGameId() == GID_ICEMAN) && (g_sci->getEngineState()->currentRoomNumber() == 40)) {
+				// ICEMAN: when plotting course, unDrawLast is called by startPlot::changeState
+				//  there is no previous entry so we get 0 in here
+			} else {
+				error("isSaneNodePointer: Node at %04x:%04x wasn't found", PRINT_REG(addr));
+			}
 			return false;
 		}
 


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