aboutsummaryrefslogtreecommitdiff
path: root/engines/bladerunner/vqa_player.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2017-03-26 17:20:06 -0400
committerPaul Gilbert2017-03-26 17:20:06 -0400
commitb88d898b374fd159ce8a37534e296eadd6ba656e (patch)
tree23fc7b703cfe225c5131e0afa89843f4cc357d4e /engines/bladerunner/vqa_player.cpp
parent5f18daa54c89e06598702d0c0455f9cd489396aa (diff)
downloadscummvm-rg350-b88d898b374fd159ce8a37534e296eadd6ba656e.tar.gz
scummvm-rg350-b88d898b374fd159ce8a37534e296eadd6ba656e.tar.bz2
scummvm-rg350-b88d898b374fd159ce8a37534e296eadd6ba656e.zip
BLADERUNNER: Fix compilation in Visual Studio 2015
It won't let the function pointer parameters in the debug calls to be cast to void *. Hopefully the alternate uint cast I've changed it to won't be a problem with any other compiler
Diffstat (limited to 'engines/bladerunner/vqa_player.cpp')
-rw-r--r--engines/bladerunner/vqa_player.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/bladerunner/vqa_player.cpp b/engines/bladerunner/vqa_player.cpp
index e2b3833390..ba7001bfd5 100644
--- a/engines/bladerunner/vqa_player.cpp
+++ b/engines/bladerunner/vqa_player.cpp
@@ -130,7 +130,7 @@ void VQAPlayer::updateLights(Lights *lights) {
}
bool VQAPlayer::setLoop(int loop, int repeatsCount, int loopMode, void (*callback)(void *, int, int), void *callbackData) {
- debug("VQAPlayer::setBeginAndEndFrameFromLoop(%i, %i, %i, %p, %p), streamLoaded = %i", loop, repeatsCount, loopMode, (void*)callback, callbackData, _s != nullptr);
+ debug("VQAPlayer::setBeginAndEndFrameFromLoop(%i, %i, %i, %x, %p), streamLoaded = %i", loop, repeatsCount, loopMode, (uint)callback, callbackData, _s != nullptr);
if (_s == nullptr) {
_loopInitial = loop;
_repeatsCountInitial = repeatsCount;
@@ -149,7 +149,7 @@ bool VQAPlayer::setLoop(int loop, int repeatsCount, int loopMode, void (*callbac
}
bool VQAPlayer::setBeginAndEndFrame(int begin, int end, int repeatsCount, int loopMode, void (*callback)(void *, int, int), void *callbackData) {
- debug("VQAPlayer::setBeginAndEndFrame(%i, %i, %i, %i, %p, %p), streamLoaded = %i", begin, end, repeatsCount, loopMode, (void*)callback, callbackData, _s != nullptr);
+ debug("VQAPlayer::setBeginAndEndFrame(%i, %i, %i, %i, %x, %p), streamLoaded = %i", begin, end, repeatsCount, loopMode, (uint)callback, callbackData, _s != nullptr);
if (repeatsCount < 0) {
repeatsCount = -1;