[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.96,1.97

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Sat Jun 14 01:58:13 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv5332

Modified Files:
	resource.cpp 
Log Message:
Format string/argument mismatch fixes.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- resource.cpp	7 Jun 2003 00:13:24 -0000	1.96
+++ resource.cpp	14 Jun 2003 08:57:56 -0000	1.97
@@ -1110,7 +1110,7 @@
 
 		// Conver the ticks into a MIDI tempo. 
 		dw = (500000 * 256) / ticks;
-		debug(4, "  ticks = %d, speed = %ld", ticks, dw);
+		debug(4, "  ticks = %d, speed = %u", ticks, dw);
 		
 		// Write a tempo change SysEx
 		memcpy(ptr, "\x00\xFF\x51\x03", 4); ptr += 4;
@@ -1254,7 +1254,7 @@
 
 	setResourceCounter(type, idx, 1);
 
-	debug(9, "getResourceAddress(%s,%d) == %ld", resTypeFromId(type), idx, ptr + sizeof(MemBlkHeader));
+	debug(9, "getResourceAddress(%s,%d) == %p", resTypeFromId(type), idx, ptr + sizeof(MemBlkHeader));
 	return ptr + sizeof(MemBlkHeader);
 }
 





More information about the Scummvm-git-logs mailing list