thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SWORD25: Get rid of casts on OSystem::copyRectToScreen calls.

Browse source
This commit is contained in:
Johannes Schickel 2012-06-16 02:37:02 +02:00
parent d8aff72402
commit 5f65cf9679
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sword25/fmv/movieplayer.cpp
View file

@ -132,7 +132,7 @@ void MoviePlayer::update() {
const byte *frameData = (const byte *)s->getBasePtr(0, 0); const byte *frameData = (const byte *)s->getBasePtr(0, 0);
_outputBitmap->setContent(frameData, s->pitch * s->h, 0, s->pitch); _outputBitmap->setContent(frameData, s->pitch * s->h, 0, s->pitch);
#else #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(); g_system->updateScreen();
#endif #endif
} }

2
engines/sword25/gfx/graphicengine.cpp
View file

@ -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; return true;

2
engines/sword25/gfx/image/renderedimage.cpp
View file

@ -430,7 +430,7 @@ bool RenderedImage::blit(int posX, int posY, int flipping, Common::Rect *pPartRe
ino += inoStep; 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); img->w, img->h);
} }