diff options
author | Johannes Schickel | 2007-12-15 21:20:56 +0000 |
---|---|---|
committer | Johannes Schickel | 2007-12-15 21:20:56 +0000 |
commit | 6dcbc00b238c1cb85720ee44f580e9242ee268be (patch) | |
tree | 331447fd63a15fa79335ac380064bdf048d1350a /engines | |
parent | d632206248f2910afe6a9628d82c08e5b180fd6b (diff) | |
download | scummvm-rg350-6dcbc00b238c1cb85720ee44f580e9242ee268be.tar.gz scummvm-rg350-6dcbc00b238c1cb85720ee44f580e9242ee268be.tar.bz2 scummvm-rg350-6dcbc00b238c1cb85720ee44f580e9242ee268be.zip |
debug(C) parameter type fixes.
svn-id: r29864
Diffstat (limited to 'engines')
-rw-r--r-- | engines/kyra/saveload_v1.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/screen.cpp | 6 | ||||
-rw-r--r-- | engines/kyra/staticres.cpp | 4 | ||||
-rw-r--r-- | engines/kyra/vqa.cpp | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/engines/kyra/saveload_v1.cpp b/engines/kyra/saveload_v1.cpp index 185b13c175..21a4f724d1 100644 --- a/engines/kyra/saveload_v1.cpp +++ b/engines/kyra/saveload_v1.cpp @@ -65,7 +65,7 @@ void KyraEngine_v1::loadGame(const char *fileName) { } 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; } diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 902b1c29da..8849a6656b 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -1629,7 +1629,7 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int } 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 @@ void Screen::decodeFrame3(const uint8 *src, uint8 *dst, uint32 size) { } 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 @@ void Screen::loadPalette(const char *filename, uint8 *palData) { 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); diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index 3f1466e8bf..0df0f536a1 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -242,9 +242,9 @@ bool StaticResource::init() { 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) diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp index 685a3e5a31..db7cad941b 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/vqa.cpp @@ -295,7 +295,7 @@ bool VQAMovie::open(const char *filename) { } 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 @@ bool VQAMovie::open(const char *filename) { 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 @@ void VQAMovie::displayFrame(uint frameNum) { 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 @@ void VQAMovie::displayFrame(uint frameNum) { 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 @@ void VQAMovie::play() { 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; } |