diff options
| author | Filippos Karapetis | 2011-02-07 18:35:30 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-11-20 22:43:10 +0100 |
| commit | 02514db64fcae15c12f8d59662ae9ed43e60f887 (patch) | |
| tree | b25ad3bcac885594a08a9a4f4475054ee95ae7ef | |
| parent | 581f0ba8b57458924a83d20eed55e577574cb1ac (diff) | |
| download | scummvm-rg350-02514db64fcae15c12f8d59662ae9ed43e60f887.tar.gz scummvm-rg350-02514db64fcae15c12f8d59662ae9ed43e60f887.tar.bz2 scummvm-rg350-02514db64fcae15c12f8d59662ae9ed43e60f887.zip | |
TOLTECS: Sync with the latest changes in trunk
| -rw-r--r-- | engines/toltecs/palette.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/toltecs/palette.cpp b/engines/toltecs/palette.cpp index 0b5eb65cbb..6fc60290ac 100644 --- a/engines/toltecs/palette.cpp +++ b/engines/toltecs/palette.cpp @@ -46,13 +46,13 @@ void Palette::setFullPalette(byte *palette) { colors[i * 4 + 2] = palette[i * 3 + 2] << 2; colors[i * 4 + 3] = 255; } - _vm->_system->setPalette((const byte *)colors, 0, 256); + _vm->_system->getPaletteManager()->setPalette((const byte *)colors, 0, 256); _vm->_system->updateScreen(); } void Palette::getFullPalette(byte *palette) { byte colors[1024]; - _vm->_system->grabPalette(colors, 0, 256); + _vm->_system->getPaletteManager()->grabPalette(colors, 0, 256); for (int i = 0; i < 256; i++) { palette[i * 3 + 0] = colors[i * 4 + 0] >> 2; palette[i * 3 + 1] = colors[i * 4 + 1] >> 2; @@ -70,7 +70,7 @@ void Palette::setDeltaPalette(byte *palette, byte mask, char deltaValue, int16 c count++; - _vm->_system->grabPalette(colors, 0, 256); + _vm->_system->getPaletteManager()->grabPalette(colors, 0, 256); deltaValue *= -1; @@ -86,7 +86,7 @@ void Palette::setDeltaPalette(byte *palette, byte mask, char deltaValue, int16 c debug(0, "startIndex = %d; colorCount = %d", startIndex, colorCount); - _vm->_system->setPalette((const byte *)colors, 0, 256); + _vm->_system->getPaletteManager()->setPalette((const byte *)colors, 0, 256); } |