diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sword1/animation.cpp | 5 | ||||
| -rw-r--r-- | engines/sword2/animation.cpp | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index a033abbc3d..c0cd85a7c2 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -555,9 +555,10 @@ bool MoviePlayerMPEG::initOverlays(uint32 id) { _logoOvls[fcnt][cnt] = _logoOvls[fcnt - 1][cnt]; } uint8 *pal = ovlFile.fetchFile(12); - _introPal = (OverlayColor*)malloc(256 * sizeof(OverlayColor)); + _introPal = (OverlayColor *)malloc(256 * sizeof(OverlayColor)); + Graphics::PixelFormat format = _system->getOverlayFormat(); for (uint16 cnt = 0; cnt < 256; cnt++) - _introPal[cnt] = _system->RGBToColor(pal[cnt * 3 + 0], pal[cnt * 3 + 1], pal[cnt * 3 + 2]); + _introPal[cnt] = Graphics::RGBToColor(pal[cnt * 3 + 0], pal[cnt * 3 + 1], pal[cnt * 3 + 2], format); } return true; diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index fb5642a816..1452cc61dc 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -654,8 +654,9 @@ void AnimationState::drawTextObject(SpriteInfo *s, byte *src) { OverlayColor *dst = _overlay + textY * moviePitch + textX; - OverlayColor pen = _sys->RGBToColor(255, 255, 255); - OverlayColor border = _sys->RGBToColor(0, 0, 0); + Graphics::PixelFormat format = _sys->getOverlayFormat(); + OverlayColor pen = Graphics::RGBToColor(255, 255, 255, format); + OverlayColor border = Graphics::RGBToColor(0, 0, 0, format); // TODO: Use the AdvMame scalers for the text? Pre-scale it? @@ -702,7 +703,8 @@ void AnimationState::clearFrame() { #ifdef BACKEND_8BIT memset(_vm->_screen->getScreen(), 0, _movieWidth * _movieHeight); #else - OverlayColor black = _sys->RGBToColor(0, 0, 0); + Graphics::PixelFormat format = _sys->getOverlayFormat(); + OverlayColor black = Graphics::RGBToColor(0, 0, 0, format); for (int i = 0; i < _movieScale * _movieWidth * _movieScale * _movieHeight; i++) _overlay[i] = black; |