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/mohawk | |
| 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/mohawk')
| -rw-r--r-- | engines/mohawk/graphics.cpp | 4 | ||||
| -rw-r--r-- | engines/mohawk/livingbooks.cpp | 6 | ||||
| -rw-r--r-- | engines/mohawk/view.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp index ece2a69864..fe015b4527 100644 --- a/engines/mohawk/graphics.cpp +++ b/engines/mohawk/graphics.cpp @@ -147,7 +147,7 @@ void GraphicsManager::setPalette(uint16 id) { delete tpalStream; - getVM()->_system->setPalette(palette, colorStart, colorCount); + getVM()->_system->getPaletteManager()->setPalette(palette, colorStart, colorCount); delete[] palette; } @@ -1016,7 +1016,7 @@ void LBGraphics::setPalette(uint16 id) { delete ctblStream; - _vm->_system->setPalette(palette, 0, colorCount); + _vm->_system->getPaletteManager()->setPalette(palette, 0, colorCount); delete[] palette; } else { GraphicsManager::setPalette(id); diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp index 6017ab1218..e32c7df6a0 100644 --- a/engines/mohawk/livingbooks.cpp +++ b/engines/mohawk/livingbooks.cpp @@ -3018,7 +3018,7 @@ void LBPaletteItem::update() { // TODO: actual fading-in if (_visible && _globalVisible) { - _vm->_system->setPalette(_palette + _drawStart * 4, _drawStart, _drawCount); + _vm->_system->getPaletteManager()->setPalette(_palette + _drawStart * 4, _drawStart, _drawCount); _vm->_needsRedraw = true; } } @@ -3130,9 +3130,9 @@ void LBLiveTextItem::paletteUpdate(uint16 word, bool on) { } if (on) { - _vm->_system->setPalette(_highlightColor, _paletteIndex + word, 1); + _vm->_system->getPaletteManager()->setPalette(_highlightColor, _paletteIndex + word, 1); } else { - _vm->_system->setPalette(_foregroundColor, _paletteIndex + word, 1); + _vm->_system->getPaletteManager()->setPalette(_foregroundColor, _paletteIndex + word, 1); } } diff --git a/engines/mohawk/view.cpp b/engines/mohawk/view.cpp index 54ed552535..241b2c3663 100644 --- a/engines/mohawk/view.cpp +++ b/engines/mohawk/view.cpp @@ -431,7 +431,7 @@ void View::setColors(Common::SeekableReadStream *tpalStream) { } // TODO: copy into temporary buffer - _vm->_system->setPalette(palette, colorStart, colorCount); + _vm->_system->getPaletteManager()->setPalette(palette, colorStart, colorCount); delete[] palette; // original does pdLightenUp here.. |