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/sword1 | |
| 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/sword1')
| -rw-r--r-- | engines/sword1/animation.cpp | 2 | ||||
| -rw-r--r-- | engines/sword1/control.cpp | 4 | ||||
| -rw-r--r-- | engines/sword1/screen.cpp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index 20ce543a55..7dab38b500 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -176,7 +176,7 @@ void MoviePlayer::play() { byte pal[4 * 256]; memset(pal, 0, sizeof(pal)); - _system->setPalette(pal, 0, 256); + _system->getPaletteManager()->setPalette(pal, 0, 256); } void MoviePlayer::performPostProcessing(byte *screen) { diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index aee49c4b60..1d310d55e2 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -256,7 +256,7 @@ void Control::askForCd() { } palOut[0] = palOut[1] = palOut[2] = palOut[3] = 0; _resMan->resClose(SR_PALETTE); - _system->setPalette(palOut, 0, 256); + _system->getPaletteManager()->setPalette(palOut, 0, 256); free(palOut); char fName[10]; @@ -326,7 +326,7 @@ uint8 Control::runPanel() { } palOut[0] = palOut[1] = palOut[2] = palOut[3] = 0; _resMan->resClose(SR_PALETTE); - _system->setPalette(palOut, 0, 256); + _system->getPaletteManager()->setPalette(palOut, 0, 256); free(palOut); uint8 mode = 0, newMode = BUTTON_MAIN_PANEL; bool fullRefresh = false; diff --git a/engines/sword1/screen.cpp b/engines/sword1/screen.cpp index d31396aa2b..9c8d352fda 100644 --- a/engines/sword1/screen.cpp +++ b/engines/sword1/screen.cpp @@ -154,14 +154,14 @@ void Screen::fnSetPalette(uint8 start, uint16 length, uint32 id, bool fadeUp) { _fadingStep = 1; _fadingDirection = FADE_UP; memset(_currentPalette, 0, 256 * 4); - _system->setPalette(_currentPalette, 0, 256); + _system->getPaletteManager()->setPalette(_currentPalette, 0, 256); } else - _system->setPalette(_targetPalette + 4 * start, start, length); + _system->getPaletteManager()->setPalette(_targetPalette + 4 * start, start, length); } void Screen::fullRefresh() { _fullRefresh = true; - _system->setPalette(_targetPalette, 0, 256); + _system->getPaletteManager()->setPalette(_targetPalette, 0, 256); } bool Screen::stillFading() { @@ -197,7 +197,7 @@ void Screen::updateScreen() { } if (_fadingStep) { fadePalette(); - _system->setPalette(_currentPalette, 0, 256); + _system->getPaletteManager()->setPalette(_currentPalette, 0, 256); } uint16 scrlX = (uint16)Logic::_scriptVars[SCROLL_OFFSET_X]; |