diff options
| author | Einar Johan Trøan Sømåen | 2012-08-13 02:09:09 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-13 02:09:09 +0200 |
| commit | bca8ce861ad3439881fef0f916b592aafc4ee010 (patch) | |
| tree | caaa3d79b0b47624ef48a48248b63f765a5e0628 /engines/sword2 | |
| parent | c1b5626bca1e0e08316353f1ead00ed763cd5380 (diff) | |
| parent | c839fd50b5ddfcceada8cbbd3046ce219df248a0 (diff) | |
| download | scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.tar.gz scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.tar.bz2 scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.zip | |
Merge remote-tracking branch 'origin/master' into wintermute
Diffstat (limited to 'engines/sword2')
| -rw-r--r-- | engines/sword2/animation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index 90ee7375ab..5e3f8929e9 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -332,7 +332,7 @@ bool MoviePlayer::playVideo() { if (_decoderType == kVideoDecoderPSX) drawFramePSX(frame); else - _vm->_system->copyRectToScreen((byte *)frame->pixels, frame->pitch, x, y, frame->w, frame->h); + _vm->_system->copyRectToScreen(frame->pixels, frame->pitch, x, y, frame->w, frame->h); } if (_decoder->hasDirtyPalette()) { @@ -401,7 +401,7 @@ void MoviePlayer::drawFramePSX(const Graphics::Surface *frame) { uint16 x = (g_system->getWidth() - scaledFrame.w) / 2; uint16 y = (g_system->getHeight() - scaledFrame.h) / 2; - _vm->_system->copyRectToScreen((byte *)scaledFrame.pixels, scaledFrame.pitch, x, y, scaledFrame.w, scaledFrame.h); + _vm->_system->copyRectToScreen(scaledFrame.pixels, scaledFrame.pitch, x, y, scaledFrame.w, scaledFrame.h); scaledFrame.free(); } |