diff options
| author | Joost Peters | 2005-04-06 19:18:08 +0000 |
|---|---|---|
| committer | Joost Peters | 2005-04-06 19:18:08 +0000 |
| commit | 60a64494d13f2266bf30c0c17633e23316cadb97 (patch) | |
| tree | fccb0678fdecb6e68eb8aa8ac9ab6cb504e3bb19 /gob | |
| parent | fd6b2050abf3ef97fbd090dfdeb6e49b16f67746 (diff) | |
| download | scummvm-rg350-60a64494d13f2266bf30c0c17633e23316cadb97.tar.gz scummvm-rg350-60a64494d13f2266bf30c0c17633e23316cadb97.tar.bz2 scummvm-rg350-60a64494d13f2266bf30c0c17633e23316cadb97.zip | |
use upper bits instead of lower bits when upscaling palette
svn-id: r17423
Diffstat (limited to 'gob')
| -rw-r--r-- | gob/video.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gob/video.cpp b/gob/video.cpp index ec87e44ce2..077ae3be49 100644 --- a/gob/video.cpp +++ b/gob/video.cpp @@ -331,9 +331,9 @@ void vid_setPalElem(int16 index, char red, char green, char blue, int16 unused, error("vid_setPalElem: Video mode 0x%x is not supported!", vidMode); - pal[0] = (red << 2) | (red & 3); - pal[1] = (green << 2) | (green & 3); - pal[2] = (blue << 2) | (blue & 3); + pal[0] = (red << 2) | (red >> 4); + pal[1] = (green << 2) | (green >> 4); + pal[2] = (blue << 2) | (blue >> 4); pal[3] = 0; g_system->setPalette(pal, index, 1); } @@ -353,9 +353,9 @@ void vid_setPalette(PalDesc *palDesc) { numcolors = 16; for (i = 0; i < numcolors; i++) { - pal[i * 4 + 0] = (palDesc->vgaPal[i].red << 2) | (palDesc->vgaPal[i].red & 3); - pal[i * 4 + 1] = (palDesc->vgaPal[i].green << 2) | (palDesc->vgaPal[i].green & 3); - pal[i * 4 + 2] = (palDesc->vgaPal[i].blue << 2) | (palDesc->vgaPal[i].blue & 3); + pal[i * 4 + 0] = (palDesc->vgaPal[i].red << 2) | (palDesc->vgaPal[i].red >> 4); + pal[i * 4 + 1] = (palDesc->vgaPal[i].green << 2) | (palDesc->vgaPal[i].green >> 4); + pal[i * 4 + 2] = (palDesc->vgaPal[i].blue << 2) | (palDesc->vgaPal[i].blue >> 4); pal[i * 4 + 3] = 0; } @@ -376,9 +376,9 @@ void vid_setFullPalette(PalDesc *palDesc) { } for (i = 0; i < 256; i++) { - pal[i * 4 + 0] = (colors[i].red << 2) | (colors[i].red & 3); - pal[i * 4 + 1] = (colors[i].green << 2) | (colors[i].green & 3); - pal[i * 4 + 2] = (colors[i].blue << 2) | (colors[i].blue & 3); + pal[i * 4 + 0] = (colors[i].red << 2) | (colors[i].red >> 4); + pal[i * 4 + 1] = (colors[i].green << 2) | (colors[i].green >> 4); + pal[i * 4 + 2] = (colors[i].blue << 2) | (colors[i].blue >> 4); pal[i * 4 + 3] = 0; } g_system->setPalette(pal, 0, 256); |