[Scummvm-cvs-logs] SF.net SVN: scummvm:[42105] scummvm/trunk/engines/scumm

[lordhoto at users.sourceforge.net]

Revision: 42105
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42105&view=rev
Author:   lordhoto
Date:     2009-07-04 18:54:27 +0000 (Sat, 04 Jul 2009)

Log Message:
-----------
Fix mismatching format arguments.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/resource_he.cpp
    scummvm/trunk/engines/scumm/script.cpp

Modified: scummvm/trunk/engines/scumm/he/resource_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/resource_he.cpp	2009-07-04 18:54:06 UTC (rev 42104)
+++ scummvm/trunk/engines/scumm/he/resource_he.cpp	2009-07-04 18:54:27 UTC (rev 42105)
@@ -474,7 +474,7 @@
 	int need_size = (int)((byte *)offset - memory + size);
 
 	debugC(DEBUG_RESOURCE, "check_offset: size=%x vs %x offset=%x size=%x",
-		need_size, total_size, (byte *)offset - memory, size);
+		need_size, total_size, (uint)((byte *)offset - memory), size);
 
 	if (need_size < 0 || need_size > total_size) {
 		error("%s: premature end", name);

Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2009-07-04 18:54:06 UTC (rev 42104)
+++ scummvm/trunk/engines/scumm/script.cpp	2009-07-04 18:54:27 UTC (rev 42105)
@@ -462,7 +462,7 @@
 			vm.slot[_currentScript].didexec = true;
 		debugC(DEBUG_OPCODES, "Script %d, offset 0x%x: [%X] %s()",
 				vm.slot[_currentScript].number,
-				_scriptPointer - _scriptOrgPointer,
+				(uint)(_scriptPointer - _scriptOrgPointer),
 				_opcode,
 				getOpcodeDesc(_opcode));
 		if (_hexdumpScripts == true) {


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