diff options
| author | Max Horn | 2011-02-07 17:52:38 +0000 |
|---|---|---|
| committer | Max Horn | 2011-02-07 17:52:38 +0000 |
| commit | ab039812e7d0a0202317c61a2cb64874e4d0c410 (patch) | |
| tree | c3069b36ba6e18068fa343416acf485e2d0728e4 /engines/toon | |
| parent | 8981fa3f164aa8f397df2af8b85d6edfa4bdd883 (diff) | |
| download | scummvm-rg350-ab039812e7d0a0202317c61a2cb64874e4d0c410.tar.gz scummvm-rg350-ab039812e7d0a0202317c61a2cb64874e4d0c410.tar.bz2 scummvm-rg350-ab039812e7d0a0202317c61a2cb64874e4d0c410.zip | |
COMMON: OSystem now has a PaletteManager
svn-id: r55806
Diffstat (limited to 'engines/toon')
| -rw-r--r-- | engines/toon/toon.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp index e26303eed1..9027f36717 100644 --- a/engines/toon/toon.cpp +++ b/engines/toon/toon.cpp @@ -930,7 +930,7 @@ void ToonEngine::flushPalette(bool deferFlushToNextRender) { vmpalette[i*4+2] = _finalPalette[i*3+2]; vmpalette[i*4+3] = 0; } - _system->setPalette(vmpalette, 0, 256); + _system->getPaletteManager()->setPalette(vmpalette, 0, 256); } void ToonEngine::setPaletteEntries(uint8 *palette, int32 offset, int32 num) { memcpy(_finalPalette + offset * 3, palette, num * 3); @@ -1758,7 +1758,7 @@ void ToonEngine::fadeIn(int32 numFrames) { vmpalette[i*4+2] = f * _finalPalette[i*3+2] / (numFrames - 1); vmpalette[i*4+3] = 0; } - _system->setPalette(vmpalette, 0, 256); + _system->getPaletteManager()->setPalette(vmpalette, 0, 256); _system->updateScreen(); _system->delayMillis(_tickLength); } @@ -1767,7 +1767,7 @@ void ToonEngine::fadeIn(int32 numFrames) { void ToonEngine::fadeOut(int32 numFrames) { uint8 oldpalette[1024]; - _system->grabPalette(oldpalette, 0, 256); + _system->getPaletteManager()->grabPalette(oldpalette, 0, 256); for (int32 f = 0; f < numFrames; f++) { uint8 vmpalette[1024]; @@ -1777,7 +1777,7 @@ void ToonEngine::fadeOut(int32 numFrames) { vmpalette[i*4+2] = (numFrames - f - 1) * oldpalette[i*4+2] / (numFrames - 1); vmpalette[i*4+3] = 255; } - _system->setPalette(vmpalette, 0, 256); + _system->getPaletteManager()->setPalette(vmpalette, 0, 256); _system->updateScreen(); _system->delayMillis(_tickLength); } |