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

[thebluegr at users.sourceforge.net]

Revision: 51303
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51303&view=rev
Author:   thebluegr
Date:     2010-07-26 07:55:50 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
SCI: Added room number to signature mismatch 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-26 07:40:51 UTC (rev 51302)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-07-26 07:55:50 UTC (rev 51303)
@@ -704,7 +704,9 @@
 		switch (solution.type) {
 		case WORKAROUND_NONE:
 			kernel->signatureDebug(kernelCall.signature, argc, argv);
-			error("[VM] k%s[%x]: signature mismatch via method %s::%s (script %d, localCall %x)", kernelCall.name, kernelCallNr, originReply.objectName.c_str(), originReply.methodName.c_str(), originReply.scriptNr, originReply.localCallOffset);
+			error("[VM] k%s[%x]: signature mismatch via method %s::%s (script %d, room %d, localCall %x)", 
+				kernelCall.name, kernelCallNr, originReply.objectName.c_str(), originReply.methodName.c_str(), 
+				originReply.scriptNr, s->currentRoomNumber(), originReply.localCallOffset);
 			break;
 		case WORKAROUND_IGNORE: // don't do kernel call, leave acc alone
 			return;
@@ -749,9 +751,13 @@
 				int callNameLen = strlen(kernelCall.name);
 				if (strncmp(kernelCall.name, kernelSubCall.name, callNameLen) == 0) {
 					const char *subCallName = kernelSubCall.name + callNameLen;
-					error("[VM] k%s(%s): signature mismatch via method %s::%s (script %d, localCall %x)", kernelCall.name, subCallName, originReply.objectName.c_str(), originReply.methodName.c_str(), originReply.scriptNr, originReply.localCallOffset);
+					error("[VM] k%s(%s): signature mismatch via method %s::%s (script %d, room %d, localCall %x)", 
+						kernelCall.name, subCallName, originReply.objectName.c_str(), originReply.methodName.c_str(), 
+						originReply.scriptNr, s->currentRoomNumber(), originReply.localCallOffset);
 				}
-				error("[VM] k%s: signature mismatch via method %s::%s (script %d, localCall %x)", kernelSubCall.name, originReply.objectName.c_str(), originReply.methodName.c_str(), originReply.scriptNr, originReply.localCallOffset);
+				error("[VM] k%s: signature mismatch via method %s::%s (script %d, room %d, localCall %x)", 
+					kernelSubCall.name, originReply.objectName.c_str(), originReply.methodName.c_str(), 
+					originReply.scriptNr, s->currentRoomNumber(), originReply.localCallOffset);
 				break;
 			}
 			case WORKAROUND_IGNORE: // don't do kernel call, leave acc alone


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