aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2012-06-16 02:38:16 +0200
committerJohannes Schickel2012-06-16 02:39:00 +0200
commit58bf8090cc760cd3c02724ae4479494d3b3a2cc1 (patch)
tree85f8df3425ee33e80216cb42a877f6e2a978829a
parent72f1fb0bed17106fa4d3b437699bc1bc9db62192 (diff)
downloadscummvm-rg350-58bf8090cc760cd3c02724ae4479494d3b3a2cc1.tar.gz
scummvm-rg350-58bf8090cc760cd3c02724ae4479494d3b3a2cc1.tar.bz2
scummvm-rg350-58bf8090cc760cd3c02724ae4479494d3b3a2cc1.zip
TOON: Get rid of casts on OSystem::copyRectToScreen calls.
-rw-r--r--engines/toon/movie.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/toon/movie.cpp b/engines/toon/movie.cpp
index 59ad8484d5..8cdf92363f 100644
--- a/engines/toon/movie.cpp
+++ b/engines/toon/movie.cpp
@@ -116,17 +116,17 @@ bool Movie::playVideo(bool isFirstIntroVideo) {
}
_vm->getSystem()->unlockScreen();
} else {
- _vm->getSystem()->copyRectToScreen((byte *)frame->pixels, frame->pitch, 0, 0, frame->w, frame->h);
+ _vm->getSystem()->copyRectToScreen(frame->pixels, frame->pitch, 0, 0, frame->w, frame->h);
// WORKAROUND: There is an encoding glitch in the first intro video. This hides this using the adjacent pixels.
if (isFirstIntroVideo) {
int32 currentFrame = _decoder->getCurFrame();
if (currentFrame >= 956 && currentFrame <= 1038) {
debugC(1, kDebugMovie, "Triggered workaround for glitch in first intro video...");
- _vm->getSystem()->copyRectToScreen((const byte *)frame->getBasePtr(frame->w-188, 123), frame->pitch, frame->w-188, 124, 188, 1);
- _vm->getSystem()->copyRectToScreen((const byte *)frame->getBasePtr(frame->w-188, 126), frame->pitch, frame->w-188, 125, 188, 1);
- _vm->getSystem()->copyRectToScreen((const byte *)frame->getBasePtr(0, 125), frame->pitch, 0, 126, 64, 1);
- _vm->getSystem()->copyRectToScreen((const byte *)frame->getBasePtr(0, 128), frame->pitch, 0, 127, 64, 1);
+ _vm->getSystem()->copyRectToScreen(frame->getBasePtr(frame->w-188, 123), frame->pitch, frame->w-188, 124, 188, 1);
+ _vm->getSystem()->copyRectToScreen(frame->getBasePtr(frame->w-188, 126), frame->pitch, frame->w-188, 125, 188, 1);
+ _vm->getSystem()->copyRectToScreen(frame->getBasePtr(0, 125), frame->pitch, 0, 126, 64, 1);
+ _vm->getSystem()->copyRectToScreen(frame->getBasePtr(0, 128), frame->pitch, 0, 127, 64, 1);
}
}
}