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

[thebluegr at users.sourceforge.net]

Revision: 50202
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50202&view=rev
Author:   thebluegr
Date:     2010-06-24 07:32:34 +0000 (Thu, 24 Jun 2010)

Log Message:
-----------
Changed an error in LocalVariables::dereference() back to a warning, as it occurs in 2 places during the intro of LB2 (called from kMemory(peek))

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

Modified: scummvm/trunk/engines/sci/engine/segment.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/segment.cpp	2010-06-24 07:05:40 UTC (rev 50201)
+++ scummvm/trunk/engines/sci/engine/segment.cpp	2010-06-24 07:32:34 UTC (rev 50202)
@@ -464,7 +464,10 @@
 	if (ret.maxSize > 0) {
 		ret.reg = &_locals[pointer.offset / 2];
 	} else {
-		error("LocalVariables::dereference: Offset at end or out of bounds %04x:%04x", PRINT_REG(pointer));
+		// Happens in two places during the intro of LB2CD, both from kMemory(peek):
+		// - room 160: Heap 160 has 83 local variables (0-82), and the game asks for variables at indices 83 - 90 too
+		// - room 220: Heap 220 has 114 local variables (0-113), and the game asks for variables at indices 114-120 too
+		warning("LocalVariables::dereference: Offset at end or out of bounds %04x:%04x", PRINT_REG(pointer));
 		ret.reg = 0;
 	}
 	return ret;


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