diff options
| author | Peter Kohaut | 2019-08-31 23:06:30 +0200 |
|---|---|---|
| committer | Peter Kohaut | 2019-08-31 23:09:19 +0200 |
| commit | a7399c5111cc7ebeea284498a1ee5ac7542bb96d (patch) | |
| tree | f89653b084b58ce909d4487a8251338acaf236d0 /engines/bladerunner/dialogue_menu.cpp | |
| parent | 6fc73734c12248947ff2214ffd517a32816031c4 (diff) | |
| download | scummvm-rg350-a7399c5111cc7ebeea284498a1ee5ac7542bb96d.tar.gz scummvm-rg350-a7399c5111cc7ebeea284498a1ee5ac7542bb96d.tar.bz2 scummvm-rg350-a7399c5111cc7ebeea284498a1ee5ac7542bb96d.zip | |
BLADERUNNER: Use best pixel format on every platform
Updated all drawing routines to be pixel format agnostic.
Might decrease performance.
Diffstat (limited to 'engines/bladerunner/dialogue_menu.cpp')
| -rw-r--r-- | engines/bladerunner/dialogue_menu.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/bladerunner/dialogue_menu.cpp b/engines/bladerunner/dialogue_menu.cpp index 2a9dcd884c..b7183f31d0 100644 --- a/engines/bladerunner/dialogue_menu.cpp +++ b/engines/bladerunner/dialogue_menu.cpp @@ -380,7 +380,7 @@ void DialogueMenu::draw(Graphics::Surface &s) { for (int i = 0; i != _listSize; ++i) { _shapes[1].draw(s, x1, y); _shapes[4].draw(s, x2, y); - uint16 color = s.format.RGBToColor((_items[i].colorIntensity / 2) * (256 / 32), (_items[i].colorIntensity / 2) * (256 / 32), _items[i].colorIntensity * (256 / 32)); + uint32 color = s.format.RGBToColor((_items[i].colorIntensity / 2) * (256 / 32), (_items[i].colorIntensity / 2) * (256 / 32), _items[i].colorIntensity * (256 / 32)); _vm->_mainFont->drawString(&s, _items[i].text, x, y, s.w, color); y += kLineHeight; } @@ -552,13 +552,13 @@ void DialogueMenu::darkenRect(Graphics::Surface &s, int x1, int y1, int x2, int if (x1 < x2 && y1 < y2) { for (int y = y1; y != y2; ++y) { for (int x = x1; x != x2; ++x) { - uint16 *p = (uint16 *)s.getBasePtr(CLIP(x, 0, s.w - 1), CLIP(y, 0, s.h - 1)); + void *p = s.getBasePtr(CLIP(x, 0, s.w - 1), CLIP(y, 0, s.h - 1)); uint8 r, g, b; - s.format.colorToRGB(*p, r, g, b); + s.format.colorToRGB(*(uint32*)p, r, g, b); r /= 4; g /= 4; b /= 4; - *p = s.format.RGBToColor(r, g, b); + drawPixel(s, p, s.format.RGBToColor(r, g, b)); } } } |