aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorOri Avtalion2016-01-07 14:52:11 +0200
committerOri Avtalion2016-01-07 14:55:32 +0200
commitd8045c67273faedd806c0e0f11801df2bb9ce4c6 (patch)
treeb3cb7dc4d71236d12fd26501d00aa4b02991c2e4 /engines/scumm
parentafd4b82a8ad760abee3224e618e951da72268d51 (diff)
downloadscummvm-rg350-d8045c67273faedd806c0e0f11801df2bb9ce4c6.tar.gz
scummvm-rg350-d8045c67273faedd806c0e0f11801df2bb9ce4c6.tar.bz2
scummvm-rg350-d8045c67273faedd806c0e0f11801df2bb9ce4c6.zip
JANITORIAL: Fix clang printf warnings
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/insane/insane.cpp2
-rw-r--r--engines/scumm/resource.cpp2
-rw-r--r--engines/scumm/smush/imuse_channel.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp
index b3e9a0e699..f0bbab53e6 100644
--- a/engines/scumm/insane/insane.cpp
+++ b/engines/scumm/insane/insane.cpp
@@ -1406,7 +1406,7 @@ int32 Insane::smush_setupSanWithFlu(const char *filename, int32 setupsan2, int32
int32 offset;
debugC(DEBUG_INSANE, "smush_setupSanWithFlu(%s, %d, %d, %d, %d, %p, %d)", filename, setupsan2,
- step1, step2, setupsan1, fluPtr, numFrames);
+ step1, step2, setupsan1, (void *)fluPtr, numFrames);
_smush_setupsan1 = setupsan1;
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index d4e4f43d5c..5456ae4f8f 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -748,7 +748,7 @@ byte *ScummEngine::getResourceAddress(ResType type, ResId idx) {
_res->setResourceCounter(type, idx, 1);
- debugC(DEBUG_RESOURCE, "getResourceAddress(%s,%d) == %p", nameOfResType(type), idx, ptr);
+ debugC(DEBUG_RESOURCE, "getResourceAddress(%s,%d) == %p", nameOfResType(type), idx, (void *)ptr);
return ptr;
}
diff --git a/engines/scumm/smush/imuse_channel.cpp b/engines/scumm/smush/imuse_channel.cpp
index 461aff962e..24cb03fbfb 100644
--- a/engines/scumm/smush/imuse_channel.cpp
+++ b/engines/scumm/smush/imuse_channel.cpp
@@ -156,7 +156,7 @@ void ImuseChannel::decode() {
_sbufferSize -= remaining_size;
} else {
debugC(DEBUG_SMUSH, "impossible ! : %p, %d, %d, %p(%d), %p(%d, %d)",
- (const void *)this, _dataSize, _inData, _tbuffer, _tbufferSize, _sbuffer, _sbufferSize, _srbufferSize);
+ (const void *)this, _dataSize, _inData, (void *)_tbuffer, _tbufferSize, (void *)_sbuffer, _sbufferSize, _srbufferSize);
byte *old = _tbuffer;
int new_size = remaining_size + _tbufferSize;
_tbuffer = (byte *)malloc(new_size);