Skip to content
Permalink
Browse files

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
  • Loading branch information
dreammaster committed Mar 26, 2017
1 parent 5f18daa commit b88d898b374fd159ce8a37534e296eadd6ba656e
Showing with 2 additions and 2 deletions.
  1. +2 −2 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;

0 comments on commit b88d898

Please sign in to comment.
You can’t perform that action at this time.