[Scummvm-cvs-logs] SF.net SVN: scummvm: [29864] scummvm/trunk/engines/kyra

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sat Dec 15 22:20:57 CET 2007


Revision: 29864
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29864&view=rev
Author:   lordhoto
Date:     2007-12-15 13:20:56 -0800 (Sat, 15 Dec 2007)

Log Message:
-----------
debug(C) parameter type fixes.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/saveload_v1.cpp
    scummvm/trunk/engines/kyra/screen.cpp
    scummvm/trunk/engines/kyra/staticres.cpp
    scummvm/trunk/engines/kyra/vqa.cpp

Modified: scummvm/trunk/engines/kyra/saveload_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_v1.cpp	2007-12-15 20:56:05 UTC (rev 29863)
+++ scummvm/trunk/engines/kyra/saveload_v1.cpp	2007-12-15 21:20:56 UTC (rev 29864)
@@ -65,7 +65,7 @@
 	}
 	uint32 version = in->readUint32BE();
 	if (version > CURRENT_VERSION) {
-		warning("Savegame is not the right version (%d)", version);
+		warning("Savegame is not the right version (%u)", version);
 		delete in;
 		return;
 	}

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2007-12-15 20:56:05 UTC (rev 29863)
+++ scummvm/trunk/engines/kyra/screen.cpp	2007-12-15 21:20:56 UTC (rev 29864)
@@ -1629,7 +1629,7 @@
 }
 
 void Screen::decodeFrame3(const uint8 *src, uint8 *dst, uint32 size) {
-	debugC(9, kDebugLevelScreen, "Screen::decodeFrame3(%p, %p, %d)", (const void *)src, (const void *)dst, size);
+	debugC(9, kDebugLevelScreen, "Screen::decodeFrame3(%p, %p, %u)", (const void *)src, (const void *)dst, size);
 	const uint8 *dstEnd = dst + size;
 	while (dst < dstEnd) {
 		int8 code = *src++;
@@ -1650,7 +1650,7 @@
 }
 
 uint Screen::decodeFrame4(const uint8 *src, uint8 *dst, uint32 dstSize) {
-	debugC(9, kDebugLevelScreen, "Screen::decodeFrame4(%p, %p, %d)", (const void *)src, (const void *)dst, dstSize);
+	debugC(9, kDebugLevelScreen, "Screen::decodeFrame4(%p, %p, %u)", (const void *)src, (const void *)dst, dstSize);
 	uint8 *dstOrig = dst;
 	uint8 *dstEnd = dst + dstSize;
 	while (1) {
@@ -2690,7 +2690,7 @@
 	uint8 *srcData = _vm->resource()->fileData(filename, &fileSize);
 
 	if (palData && fileSize) {
-		debugC(9, kDebugLevelScreen,"Loading a palette of size %i from '%s'", fileSize, filename);
+		debugC(9, kDebugLevelScreen,"Loading a palette of size %u from '%s'", fileSize, filename);
 		if (_vm->gameFlags().platform == Common::kPlatformAmiga) {
 			assert(fileSize % 2 == 0);
 			assert(fileSize / 2 <= 256);

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2007-12-15 20:56:05 UTC (rev 29863)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2007-12-15 21:20:56 UTC (rev 29864)
@@ -242,9 +242,9 @@
 	temp = 0;
 
 	if (version != RESFILE_VERSION)
-		error("invalid KYRA.DAT file version (%d, required %d)", version, RESFILE_VERSION);
+		error("invalid KYRA.DAT file version (%u, required %d)", version, RESFILE_VERSION);
 	if (gameID != _vm->game())
-		error("invalid game id (%d)", gameID);
+		error("invalid game id (%u)", gameID);
 
 	uint32 gameFeatures = createFeatures(_vm->gameFlags());
 	if ((featuresValue & GAME_FLAGS) != gameFeatures)

Modified: scummvm/trunk/engines/kyra/vqa.cpp
===================================================================
--- scummvm/trunk/engines/kyra/vqa.cpp	2007-12-15 20:56:05 UTC (rev 29863)
+++ scummvm/trunk/engines/kyra/vqa.cpp	2007-12-15 21:20:56 UTC (rev 29864)
@@ -295,7 +295,7 @@
 			}
 
 			if (size != 4 * (uint32)_header.numFrames) {
-				warning("VQAMovie::open: Expected size %d for `FINF' chunk, but got %d", 4 * _header.numFrames, size);
+				warning("VQAMovie::open: Expected size %d for `FINF' chunk, but got %u", 4 * _header.numFrames, size);
 				return false;
 			}
 
@@ -341,7 +341,7 @@
 			break;
 
 		default:
-			warning("VQAMovie::open: Unknown tag `%c%c%c%c'", (tag >> 24) & 0xFF, (tag >> 16) & 0xFF, (tag >> 8) & 0xFF, tag & 0xFF);
+			warning("VQAMovie::open: Unknown tag `%c%c%c%c'", char((tag >> 24) & 0xFF), char((tag >> 16) & 0xFF), char((tag >> 8) & 0xFF), char(tag & 0xFF));
 			_file.seek(size, SEEK_CUR);
 			break;
 		}
@@ -508,7 +508,7 @@
 					break;
 
 				default:
-					warning("VQAMovie::displayFrame: Unknown `VQFR' sub-tag `%c%c%c%c'", (tag >> 24) & 0xFF, (tag >> 16) & 0xFF, (tag >> 8) & 0xFF, tag & 0xFF);
+					warning("VQAMovie::displayFrame: Unknown `VQFR' sub-tag `%c%c%c%c'", char((tag >> 24) & 0xFF), char((tag >> 16) & 0xFF), char((tag >> 8) & 0xFF), char(tag & 0xFF));
 					_file.seek(size, SEEK_CUR);
 					break;
 				}
@@ -518,7 +518,7 @@
 			break;
 
 		default:
-			warning("VQAMovie::displayFrame: Unknown tag `%c%c%c%c'", (tag >> 24) & 0xFF, (tag >> 16) & 0xFF, (tag >> 8) & 0xFF, tag & 0xFF);
+			warning("VQAMovie::displayFrame: Unknown tag `%c%c%c%c'", char((tag >> 24) & 0xFF), char((tag >> 16) & 0xFF), char((tag >> 8) & 0xFF), char(tag & 0xFF));
 			_file.seek(size, SEEK_CUR);
 			break;
 		}
@@ -638,7 +638,7 @@
 				break;
 
 			default:
-				warning("VQAMovie::play: Unknown tag `%c%c%c%c'", (tag >> 24) & 0xFF, (tag >> 16) & 0xFF, (tag >> 8) & 0xFF, tag & 0xFF);
+				warning("VQAMovie::play: Unknown tag `%c%c%c%c'", char((tag >> 24) & 0xFF), char((tag >> 16) & 0xFF), char((tag >> 8) & 0xFF), char(tag & 0xFF));
 				_file.seek(size, SEEK_CUR);
 				break;
 			}


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




More information about the Scummvm-git-logs mailing list