diff options
| author | Johannes Schickel | 2011-02-13 15:44:01 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-02-14 17:08:32 +0100 |
| commit | 5d9e69146cef195c0b94e528bfc0a608956f34e3 (patch) | |
| tree | 7cc8bb28c193a6dd0377473e3c7d7854d3733f6d /engines/groovie/graphics.cpp | |
| parent | 04d4162357d4de5f29ba65e6c373c0304a0cad6d (diff) | |
| download | scummvm-rg350-5d9e69146cef195c0b94e528bfc0a608956f34e3.tar.gz scummvm-rg350-5d9e69146cef195c0b94e528bfc0a608956f34e3.tar.bz2 scummvm-rg350-5d9e69146cef195c0b94e528bfc0a608956f34e3.zip | |
GROOVIE: Adapt to setPalette/grabPalette RGBA->RGB change.
Diffstat (limited to 'engines/groovie/graphics.cpp')
| -rw-r--r-- | engines/groovie/graphics.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/engines/groovie/graphics.cpp b/engines/groovie/graphics.cpp index 9d6da81fb6..62ab25d9d3 100644 --- a/engines/groovie/graphics.cpp +++ b/engines/groovie/graphics.cpp @@ -106,11 +106,7 @@ void GraphicsMan::fadeIn(byte *pal) { _fadeStartTime = _vm->_system->getMillis(); // Copy the target palette - for (int i = 0; i < 256; i++) { - _paletteFull[(i * 4) + 0] = pal[(i * 3) + 0]; - _paletteFull[(i * 4) + 1] = pal[(i * 3) + 1]; - _paletteFull[(i * 4) + 2] = pal[(i * 3) + 2]; - } + memcpy(_paletteFull, pal, 3*256); // Set the current fading _fading = 1; @@ -151,11 +147,11 @@ void GraphicsMan::applyFading(int step) { } // Calculate the new palette - byte newpal[256 * 4]; + byte newpal[256 * 3]; for (int i = 0; i < 256; i++) { - newpal[(i * 4) + 0] = (_paletteFull[(i * 4) + 0] * factorR) / 256; - newpal[(i * 4) + 1] = (_paletteFull[(i * 4) + 1] * factorG) / 256; - newpal[(i * 4) + 2] = (_paletteFull[(i * 4) + 2] * factorB) / 256; + newpal[(i * 3) + 0] = (_paletteFull[(i * 3) + 0] * factorR) / 256; + newpal[(i * 3) + 1] = (_paletteFull[(i * 3) + 1] * factorG) / 256; + newpal[(i * 3) + 2] = (_paletteFull[(i * 3) + 2] * factorB) / 256; } // Set the screen palette |