diff options
author | Max Horn | 2008-11-06 15:02:50 +0000 |
---|---|---|
committer | Max Horn | 2008-11-06 15:02:50 +0000 |
commit | edf9f249260b1fd4364f6727fa622991e81e8cf3 (patch) | |
tree | 2b034d5daf7b69212957d8d51ab839974f51f2c5 /engines/sword2/animation.cpp | |
parent | f238a12b27ebfa9847814b9972fdb5789e484533 (diff) | |
download | scummvm-rg350-edf9f249260b1fd4364f6727fa622991e81e8cf3.tar.gz scummvm-rg350-edf9f249260b1fd4364f6727fa622991e81e8cf3.tar.bz2 scummvm-rg350-edf9f249260b1fd4364f6727fa622991e81e8cf3.zip |
Got rid of OSystem::colorToRGB and RGBToColor; added implementations for OSystem::getOverlayFormat to several ports (pending testing by the porters)
svn-id: r34912
Diffstat (limited to 'engines/sword2/animation.cpp')
-rw-r--r-- | engines/sword2/animation.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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; |