diff options
| author | Johannes Schickel | 2011-02-13 15:24:16 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-02-14 17:08:32 +0100 |
| commit | 0a389b310cc1794191762d142777004b5096cbb5 (patch) | |
| tree | 6f38cb421eead6be802051ccd24329ab781e421a | |
| parent | 9623ea05d6ff535cdee9098193ea32e04589d534 (diff) | |
| download | scummvm-rg350-0a389b310cc1794191762d142777004b5096cbb5.tar.gz scummvm-rg350-0a389b310cc1794191762d142777004b5096cbb5.tar.bz2 scummvm-rg350-0a389b310cc1794191762d142777004b5096cbb5.zip | |
CRUISE: Adapt to setPalette RGBA->RGB change.
| -rw-r--r-- | engines/cruise/gfxModule.cpp | 11 | ||||
| -rw-r--r-- | engines/cruise/mouse.cpp | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/engines/cruise/gfxModule.cpp b/engines/cruise/gfxModule.cpp index 00e44465f8..59561de8dc 100644 --- a/engines/cruise/gfxModule.cpp +++ b/engines/cruise/gfxModule.cpp @@ -273,16 +273,15 @@ static void mergeClipRects() { } void gfxModuleData_updatePalette() { - byte paletteRGBA[256 * 4]; + byte paletteRGBA[256 * 3]; if (palDirtyMax != -1) { for (int i = palDirtyMin; i <= palDirtyMax; i++) { - paletteRGBA[i * 4 + 0] = lpalette[i].R; - paletteRGBA[i * 4 + 1] = lpalette[i].G; - paletteRGBA[i * 4 + 2] = lpalette[i].B; - paletteRGBA[i * 4 + 3] = 0xFF; + paletteRGBA[i * 3 + 0] = lpalette[i].R; + paletteRGBA[i * 3 + 1] = lpalette[i].G; + paletteRGBA[i * 3 + 2] = lpalette[i].B; } - g_system->getPaletteManager()->setPalette(paletteRGBA + palDirtyMin*4, palDirtyMin, palDirtyMax - palDirtyMin + 1); + g_system->getPaletteManager()->setPalette(paletteRGBA + palDirtyMin*3, palDirtyMin, palDirtyMax - palDirtyMin + 1); palDirtyMin = 256; palDirtyMax = -1; } diff --git a/engines/cruise/mouse.cpp b/engines/cruise/mouse.cpp index 521ba3a54e..24309030da 100644 --- a/engines/cruise/mouse.cpp +++ b/engines/cruise/mouse.cpp @@ -52,8 +52,8 @@ static const MouseCursor mouseCursors[] = { CursorType currentCursor = CURSOR_NOMOUSE; static const byte cursorPalette[] = { - 0, 0, 0, 0xff, - 0xff, 0xff, 0xff, 0xff + 0, 0, 0, + 0xff, 0xff, 0xff }; void changeCursor(CursorType eType) { |