diff options
| author | Johannes Schickel | 2012-06-16 02:37:02 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2012-06-16 02:39:00 +0200 |
| commit | 5f65cf9679b7c01052bb4e7fe46a74a10f84665c (patch) | |
| tree | 12db52648568f622a09ebcba334512b871cdf313 | |
| parent | d8aff72402a808082e1000851b0e11dbd5f57786 (diff) | |
| download | scummvm-rg350-5f65cf9679b7c01052bb4e7fe46a74a10f84665c.tar.gz scummvm-rg350-5f65cf9679b7c01052bb4e7fe46a74a10f84665c.tar.bz2 scummvm-rg350-5f65cf9679b7c01052bb4e7fe46a74a10f84665c.zip | |
SWORD25: Get rid of casts on OSystem::copyRectToScreen calls.
| -rw-r--r-- | engines/sword25/fmv/movieplayer.cpp | 2 | ||||
| -rw-r--r-- | engines/sword25/gfx/graphicengine.cpp | 2 | ||||
| -rw-r--r-- | engines/sword25/gfx/image/renderedimage.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp index 4609565223..9ee13b4b6d 100644 --- a/engines/sword25/fmv/movieplayer.cpp +++ b/engines/sword25/fmv/movieplayer.cpp @@ -132,7 +132,7 @@ void MoviePlayer::update() { const byte *frameData = (const byte *)s->getBasePtr(0, 0); _outputBitmap->setContent(frameData, s->pitch * s->h, 0, s->pitch); #else - g_system->copyRectToScreen((byte *)s->getBasePtr(0, 0), s->pitch, _outX, _outY, MIN(s->w, _backSurface->w), MIN(s->h, _backSurface->h)); + g_system->copyRectToScreen(s->getBasePtr(0, 0), s->pitch, _outX, _outY, MIN(s->w, _backSurface->w), MIN(s->h, _backSurface->h)); g_system->updateScreen(); #endif } diff --git a/engines/sword25/gfx/graphicengine.cpp b/engines/sword25/gfx/graphicengine.cpp index 14ba032107..6f5da32bc4 100644 --- a/engines/sword25/gfx/graphicengine.cpp +++ b/engines/sword25/gfx/graphicengine.cpp @@ -216,7 +216,7 @@ bool GraphicEngine::fill(const Common::Rect *fillRectPtr, uint color) { } } - g_system->copyRectToScreen((byte *)_backSurface.getBasePtr(rect.left, rect.top), _backSurface.pitch, rect.left, rect.top, rect.width(), rect.height()); + g_system->copyRectToScreen(_backSurface.getBasePtr(rect.left, rect.top), _backSurface.pitch, rect.left, rect.top, rect.width(), rect.height()); } return true; diff --git a/engines/sword25/gfx/image/renderedimage.cpp b/engines/sword25/gfx/image/renderedimage.cpp index b0d4853e5e..27ee4ef182 100644 --- a/engines/sword25/gfx/image/renderedimage.cpp +++ b/engines/sword25/gfx/image/renderedimage.cpp @@ -430,7 +430,7 @@ bool RenderedImage::blit(int posX, int posY, int flipping, Common::Rect *pPartRe ino += inoStep; } - g_system->copyRectToScreen((byte *)_backSurface->getBasePtr(posX, posY), _backSurface->pitch, posX, posY, + g_system->copyRectToScreen(_backSurface->getBasePtr(posX, posY), _backSurface->pitch, posX, posY, img->w, img->h); } |