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

[thebluegr at users.sourceforge.net]

Revision: 51413
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51413&view=rev
Author:   thebluegr
Date:     2010-07-28 11:37:22 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
SCI: Adding the room number to some more errors

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

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-07-28 11:31:13 UTC (rev 51412)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-07-28 11:37:22 UTC (rev 51413)
@@ -203,7 +203,10 @@
 	SciTrackOriginReply originReply;
 	SciWorkaroundSolution solution = trackOriginAndFindWorkaround(0, workaroundList, &originReply);
 	if (solution.type == WORKAROUND_NONE)
-		error("%s on non-integer (%04x:%04x, %04x:%04x) from method %s::%s (script %d, localCall %x)", opcodeNames[opcode], PRINT_REG(value1), PRINT_REG(value2), originReply.objectName.c_str(), originReply.methodName.c_str(), originReply.scriptNr, originReply.localCallOffset);
+		error("%s on non-integer (%04x:%04x, %04x:%04x) from method %s::%s (script %d, room %d, localCall %x)", 
+		opcodeNames[opcode], PRINT_REG(value1), PRINT_REG(value2), originReply.objectName.c_str(), 
+		originReply.methodName.c_str(), originReply.scriptNr, g_sci->getEngineState()->currentRoomNumber(),
+		originReply.localCallOffset);
 	assert(solution.type == WORKAROUND_FAKE);
 	return make_reg(0, solution.value);
 }
@@ -218,7 +221,9 @@
 				SciTrackOriginReply originReply;
 				SciWorkaroundSolution solution = trackOriginAndFindWorkaround(index, uninitializedReadWorkarounds, &originReply);
 				if (solution.type == WORKAROUND_NONE)
-					error("Uninitialized read for temp %d from method %s::%s (script %d, localCall %x)", index, originReply.objectName.c_str(), originReply.methodName.c_str(), originReply.scriptNr, originReply.localCallOffset);
+					error("Uninitialized read for temp %d from method %s::%s (script %d, room %d, localCall %x)", 
+					index, originReply.objectName.c_str(), originReply.methodName.c_str(), originReply.scriptNr, 
+					g_sci->getEngineState()->currentRoomNumber(), originReply.localCallOffset);
 				assert(solution.type == WORKAROUND_FAKE);
 				r[index] = make_reg(0, solution.value);
 				break;


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