diff options
| author | Willem Jan Palenstijn | 2009-06-26 22:30:52 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2009-06-26 22:30:52 +0000 |
| commit | 70c9731810b28e910270429b2e5d16e2fe92f604 (patch) | |
| tree | 66a6e81babf934f43c1d7be17ee8d6c3a9a3e655 /engines/sci/gfx/gfx_pixmap_scale.cpp | |
| parent | 27e50db5d7cdbed498d6a61b1ee1ad5405ce33a2 (diff) | |
| download | scummvm-rg350-70c9731810b28e910270429b2e5d16e2fe92f604.tar.gz scummvm-rg350-70c9731810b28e910270429b2e5d16e2fe92f604.tar.bz2 scummvm-rg350-70c9731810b28e910270429b2e5d16e2fe92f604.zip | |
SCI: starting to restore RGB color functionality
svn-id: r41904
Diffstat (limited to 'engines/sci/gfx/gfx_pixmap_scale.cpp')
| -rw-r--r-- | engines/sci/gfx/gfx_pixmap_scale.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/engines/sci/gfx/gfx_pixmap_scale.cpp b/engines/sci/gfx/gfx_pixmap_scale.cpp index 52c7b12396..37843743b9 100644 --- a/engines/sci/gfx/gfx_pixmap_scale.cpp +++ b/engines/sci/gfx/gfx_pixmap_scale.cpp @@ -70,14 +70,11 @@ void _gfx_xlate_pixmap_unfiltered(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale // Calculate all colors for (i = 0; i < pxm->colors_nr(); i++) { int col; - const PaletteEntry& color = pxm->palette->getColor(i); if (mode->palette) col = color.parent_index; else { - col = mode->red_mask & ((EXTEND_COLOR(color.r)) >> mode->red_shift); - col |= mode->green_mask & ((EXTEND_COLOR(color.g)) >> mode->green_shift); - col |= mode->blue_mask & ((EXTEND_COLOR(color.b)) >> mode->blue_shift); + col = mode->format.ARGBToColor(0, color.r, color.g, color.b); col |= alpha_ormask; } result_colors[i] = col; |