[Scummvm-cvs-logs] SF.net SVN: scummvm:[39640] scummvm/trunk/engines/sky/logic.cpp

[joostp at users.sourceforge.net]

Revision: 39640
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39640&view=rev
Author:   joostp
Date:     2009-03-23 20:20:00 +0000 (Mon, 23 Mar 2009)

Log Message:
-----------
change debug output of script interpreter to more clearly print script number and offset

Modified Paths:
--------------
    scummvm/trunk/engines/sky/logic.cpp

Modified: scummvm/trunk/engines/sky/logic.cpp
===================================================================
--- scummvm/trunk/engines/sky/logic.cpp	2009-03-23 20:17:56 UTC (rev 39639)
+++ scummvm/trunk/engines/sky/logic.cpp	2009-03-23 20:20:00 UTC (rev 39640)
@@ -1242,7 +1242,6 @@
 	/// low level interface to interpreter
 
 	uint16 moduleNo = scriptNo >> 12;
-	debug(3, "Doing Script %x", (offset << 16) | scriptNo);
 	uint16 *scriptData = _moduleList[moduleNo]; // get module address
 
 	if (!scriptData) { // We need to load the script module
@@ -1252,11 +1251,13 @@
 
 	uint16 *moduleStart = scriptData;
 
+	debug(3, "Doing Script: %d:%d:%x", moduleNo, scriptNo & 0xFFF, offset ? (offset - moduleStart[scriptNo & 0xFFF]) : 0);
+
 	// Check whether we have an offset or what
 	if (offset)
 		scriptData = moduleStart + offset;
 	else
-		scriptData += scriptData[scriptNo & 0x0fff];
+		scriptData += scriptData[scriptNo & 0x0FFF];
 
 	uint32 a = 0, b = 0, c = 0;
 	uint16 command, s;


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