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

[thebluegr at users.sourceforge.net]

Revision: 39348
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39348&view=rev
Author:   thebluegr
Date:     2009-03-11 23:47:00 +0000 (Wed, 11 Mar 2009)

Log Message:
-----------
Changed a case inside inline_lookup_node() to non-fatal, for now, to make it possible to walk around in SQ4 (check the FIXME comment)

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

Modified: scummvm/trunk/engines/sci/engine/klists.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/klists.cpp	2009-03-11 23:44:22 UTC (rev 39347)
+++ scummvm/trunk/engines/sci/engine/klists.cpp	2009-03-11 23:47:00 UTC (rev 39348)
@@ -42,8 +42,11 @@
 
 	mobj = GET_SEGMENT(*s->seg_manager, addr.segment, MEM_OBJ_NODES);
 	if (!mobj) {
-		sciprintf("%s, L%d: Attempt to use non-node "PREG" as list node\n", __FILE__, __LINE__, PRINT_REG(addr));
-		script_debug_flag = script_error_flag = 1;
+		// FIXME: This occurs right at the beginning of SQ4, when walking north from the first screen. It doesn't
+		// seem to have any apparent ill-effects, though, so it's been changed to non-fatal, for now
+		//sciprintf("%s, L%d: Attempt to use non-node "PREG" as list node\n", __FILE__, __LINE__, PRINT_REG(addr));
+		//script_debug_flag = script_error_flag = 1;
+		SCIkwarn(SCIkERROR, "%s, L%d: Attempt to use non-node "PREG" as list node\n", __FILE__, __LINE__, PRINT_REG(addr));
 		return NULL;
 	}
 


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