[Scummvm-git-logs] scummvm master -> b88d898b374fd159ce8a37534e296eadd6ba656e

dreammaster dreammaster at scummvm.org
Sun Mar 26 23:21:30 CEST 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b88d898b37 BLADERUNNER: Fix compilation in Visual Studio 2015


Commit: b88d898b374fd159ce8a37534e296eadd6ba656e
    https://github.com/scummvm/scummvm/commit/b88d898b374fd159ce8a37534e296eadd6ba656e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-03-26T17:20:06-04:00

Commit Message:
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

Changed paths:
    engines/bladerunner/vqa_player.cpp


diff --git a/engines/bladerunner/vqa_player.cpp b/engines/bladerunner/vqa_player.cpp
index e2b3833..ba7001b 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;





More information about the Scummvm-git-logs mailing list