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/tucker | |
| 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/tucker')
| -rw-r--r-- | engines/tucker/locations.cpp | 2 | ||||
| -rw-r--r-- | engines/tucker/sequences.cpp | 6 | ||||
| -rw-r--r-- | engines/tucker/tucker.cpp | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp index a8191e39e4..009695e8aa 100644 --- a/engines/tucker/locations.cpp +++ b/engines/tucker/locations.cpp @@ -1798,7 +1798,7 @@ void TuckerEngine::execData3PreUpdate_locationNum29() { scrollPal[i * 4 + 1] = g[i + d]; scrollPal[i * 4 + 2] = b[i + d]; } - _system->setPalette(scrollPal, 118, 5); + _system->getPaletteManager()->setPalette(scrollPal, 118, 5); if (_flagsTable[143] == 1) { _locationObjectsTable[2].xPos = 999; _locationObjectsTable[3].xPos = 187; diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp index d804d85d9a..4a7a5f16d7 100644 --- a/engines/tucker/sequences.cpp +++ b/engines/tucker/sequences.cpp @@ -550,7 +550,7 @@ void AnimationSequencePlayer::mainLoop() { updateSounds(); } _system->copyRectToScreen(_offscreenBuffer, kScreenWidth, 0, 0, kScreenWidth, kScreenHeight); - _system->setPalette(_animationPalette, 0, 256); + _system->getPaletteManager()->setPalette(_animationPalette, 0, 256); _system->updateScreen(); syncTime(); } while (_seqNum != 1); @@ -691,7 +691,7 @@ void AnimationSequencePlayer::fadeInPalette() { fadeColors = true; } } - _system->setPalette(paletteBuffer, 0, 256); + _system->getPaletteManager()->setPalette(paletteBuffer, 0, 256); _system->updateScreen(); } _system->delayMillis(1000 / 60); @@ -712,7 +712,7 @@ void AnimationSequencePlayer::fadeOutPalette() { fadeColors = true; } } - _system->setPalette(paletteBuffer, 0, 256); + _system->getPaletteManager()->setPalette(paletteBuffer, 0, 256); _system->updateScreen(); } _system->delayMillis(1000 / 60); diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp index 2b9b4edee4..c61a4228c6 100644 --- a/engines/tucker/tucker.cpp +++ b/engines/tucker/tucker.cpp @@ -943,46 +943,46 @@ void TuckerEngine::updateFlagsForCharPosition() { void TuckerEngine::fadeOutPalette(int colorsCount) { uint8 pal[256 * 4]; - _system->grabPalette(pal, 0, colorsCount); + _system->getPaletteManager()->grabPalette(pal, 0, colorsCount); for (int color = 0; color < colorsCount; ++color) { for (int i = 0; i < 3; ++i) { const int c = int(pal[color * 4 + i]) + kFadePaletteStep * 4; pal[color * 4 + i] = MIN<int>(c, _currentPalette[color * 3 + i]); } } - _system->setPalette(pal, 0, colorsCount); + _system->getPaletteManager()->setPalette(pal, 0, colorsCount); _system->updateScreen(); waitForTimer(1); } void TuckerEngine::fadeInPalette(int colorsCount) { uint8 pal[256 * 4]; - _system->grabPalette(pal, 0, colorsCount); + _system->getPaletteManager()->grabPalette(pal, 0, colorsCount); for (int color = 0; color < colorsCount; ++color) { for (int i = 0; i < 3; ++i) { const int c = int(pal[color * 4 + i]) - kFadePaletteStep * 4; pal[color * 4 + i] = MAX<int>(c, 0); } } - _system->setPalette(pal, 0, colorsCount); + _system->getPaletteManager()->setPalette(pal, 0, colorsCount); _system->updateScreen(); waitForTimer(1); } void TuckerEngine::fadePaletteColor(int color, int step) { uint8 rgb[4]; - _system->grabPalette(rgb, color, 1); + _system->getPaletteManager()->grabPalette(rgb, color, 1); for (int i = 0; i < 3; ++i) { const int c = _currentPalette[color * 3 + i] + step * 4; rgb[i] = MIN(c, 255); } - _system->setPalette(rgb, color, 1); + _system->getPaletteManager()->setPalette(rgb, color, 1); } void TuckerEngine::setBlackPalette() { uint8 pal[256 * 4]; memset(pal, 0, sizeof(pal)); - _system->setPalette(pal, 0, 256); + _system->getPaletteManager()->setPalette(pal, 0, 256); } void TuckerEngine::updateCursor() { |
