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/sci | |
| 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/sci')
| -rw-r--r-- | engines/sci/graphics/screen.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/graphics/transitions.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp index 2543dec7bb..39b5e5a0e1 100644 --- a/engines/sci/graphics/screen.cpp +++ b/engines/sci/graphics/screen.cpp @@ -511,7 +511,7 @@ void GfxScreen::getPalette(Palette *pal) { // just copy palette to system byte bpal[4 * 256]; // Get current palette, update it and put back - g_system->grabPalette(bpal, 0, 256); + g_system->getPaletteManager()->grabPalette(bpal, 0, 256); for (int16 i = 1; i < 255; i++) { pal->colors[i].r = bpal[i * 4]; pal->colors[i].g = bpal[i * 4 + 1]; @@ -523,7 +523,7 @@ void GfxScreen::setPalette(Palette *pal) { // just copy palette to system byte bpal[4 * 256]; // Get current palette, update it and put back - g_system->grabPalette(bpal, 0, 256); + g_system->getPaletteManager()->grabPalette(bpal, 0, 256); for (int16 i = 0; i < 256; i++) { if (!pal->colors[i].used) continue; @@ -532,7 +532,7 @@ void GfxScreen::setPalette(Palette *pal) { bpal[i * 4 + 2] = CLIP(pal->colors[i].b * pal->intensity[i] / 100, 0, 255); bpal[i * 4 + 3] = 100; } - g_system->setPalette(bpal, 0, 256); + g_system->getPaletteManager()->setPalette(bpal, 0, 256); } void GfxScreen::setVerticalShakePos(uint16 shakePos) { diff --git a/engines/sci/graphics/transitions.cpp b/engines/sci/graphics/transitions.cpp index 3f4ce7bbc8..b7b2bfb38e 100644 --- a/engines/sci/graphics/transitions.cpp +++ b/engines/sci/graphics/transitions.cpp @@ -309,7 +309,7 @@ void GfxTransitions::fadeOut() { // several pictures (e.g. qfg3 demo/intro), so the fading looked weird int16 tillColorNr = getSciVersion() >= SCI_VERSION_1_1 ? 256 : 255; - g_system->grabPalette(oldPalette, 0, 256); + g_system->getPaletteManager()->grabPalette(oldPalette, 0, 256); for (stepNr = 100; stepNr >= 0; stepNr -= 10) { for (colorNr = 1; colorNr < tillColorNr; colorNr++){ @@ -317,7 +317,7 @@ void GfxTransitions::fadeOut() { workPalette[colorNr * 4 + 1] = oldPalette[colorNr * 4 + 1] * stepNr / 100; workPalette[colorNr * 4 + 2] = oldPalette[colorNr * 4 + 2] * stepNr / 100; } - g_system->setPalette(workPalette + 4, 1, 254); + g_system->getPaletteManager()->setPalette(workPalette + 4, 1, 254); g_sci->getEngineState()->wait(2); } } |