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/scumm | |
| 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/scumm')
| -rw-r--r-- | engines/scumm/he/cup_player_he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/palette_he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/palette.cpp | 6 | ||||
| -rw-r--r-- | engines/scumm/smush/smush_player.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp index fedbdbf377..2045b8084c 100644 --- a/engines/scumm/he/cup_player_he.cpp +++ b/engines/scumm/he/cup_player_he.cpp @@ -127,7 +127,7 @@ void CUP_Player::copyRectToScreen(const Common::Rect &r) { void CUP_Player::updateScreen() { if (_paletteChanged) { - _system->setPalette(_paletteData, 0, 256); + _system->getPaletteManager()->setPalette(_paletteData, 0, 256); _paletteChanged = false; } _system->updateScreen(); diff --git a/engines/scumm/he/palette_he.cpp b/engines/scumm/he/palette_he.cpp index ad3f90b8eb..c7ed9e64a8 100644 --- a/engines/scumm/he/palette_he.cpp +++ b/engines/scumm/he/palette_he.cpp @@ -394,7 +394,7 @@ void ScummEngine_v99he::updatePalette() { *p++ = 0; } - _system->setPalette(palette_colors, _palDirtyMin, num); + _system->getPaletteManager()->setPalette(palette_colors, _palDirtyMin, num); _palDirtyMax = -1; _palDirtyMin = 256; diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp index 509547984a..52592cd90e 100644 --- a/engines/scumm/palette.cpp +++ b/engines/scumm/palette.cpp @@ -223,11 +223,11 @@ void ScummEngine::resetPalette() { _townsClearLayerFlag = 0; #ifdef USE_RGB_COLOR else if (_game.id == GID_LOOM) - towns_setTextPaletteFromPtr(tableTownsLoomPalette); + towns_setTextPaletteFromPtr(tableTownsLoomPalette); else if (_game.version == 3) towns_setTextPaletteFromPtr(tableTownsV3Palette); #endif - + _townsScreen->toggleLayers(_townsActiveLayerFlags); #endif // DISABLE_TOWNS_DUAL_LAYER_MODE } @@ -1133,7 +1133,7 @@ void ScummEngine::updatePalette() { #endif #endif - _system->setPalette(palette_colors, first, num); + _system->getPaletteManager()->setPalette(palette_colors, first, num); } } // End of namespace Scumm diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index dcb47f47b8..29dbb57670 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -1229,7 +1229,7 @@ void SmushPlayer::play(const char *filename, int32 speed, int32 offset, int32 st *p++ = 0; } - _vm->_system->setPalette(palette_colors, _palDirtyMin, _palDirtyMax - _palDirtyMin + 1); + _vm->_system->getPaletteManager()->setPalette(palette_colors, _palDirtyMin, _palDirtyMax - _palDirtyMin + 1); _palDirtyMax = -1; _palDirtyMin = 256; |