diff options
| author | Johannes Schickel | 2009-06-22 02:35:04 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-06-22 02:35:04 +0000 |
| commit | 9da52cb28280e0164db7073b0d3ea5abb4d20934 (patch) | |
| tree | db192ee1f4860c48bd0e597487b8a97889088643 /engines/kyra/gui_lok.cpp | |
| parent | b448d506b89209d79bc153b6b0759ad926fa8794 (diff) | |
| download | scummvm-rg350-9da52cb28280e0164db7073b0d3ea5abb4d20934.tar.gz scummvm-rg350-9da52cb28280e0164db7073b0d3ea5abb4d20934.tar.bz2 scummvm-rg350-9da52cb28280e0164db7073b0d3ea5abb4d20934.zip | |
Got rid of Screen::_currentPalette.
svn-id: r41740
Diffstat (limited to 'engines/kyra/gui_lok.cpp')
| -rw-r--r-- | engines/kyra/gui_lok.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp index c3258b0882..255a5dcd74 100644 --- a/engines/kyra/gui_lok.cpp +++ b/engines/kyra/gui_lok.cpp @@ -1024,25 +1024,25 @@ void GUI_LoK::fadePalette() { static const int16 menuPalIndexes[] = {248, 249, 250, 251, 252, 253, 254, -1}; int index = 0; - memcpy(_screen->getPalette(2), _screen->_currentPalette, 768); + memcpy(_screen->getPalette(2), _screen->getPalette(0), 768); for (int i = 0; i < 768; i++) - _screen->_currentPalette[i] >>= 1; + _screen->getPalette(0)[i] >>= 1; while (menuPalIndexes[index] != -1) { - memcpy(&_screen->_currentPalette[menuPalIndexes[index]*3], &_screen->getPalette(2)[menuPalIndexes[index]*3], 3); + memcpy(&_screen->getPalette(0)[menuPalIndexes[index]*3], &_screen->getPalette(2)[menuPalIndexes[index]*3], 3); index++; } - _screen->fadePalette(_screen->_currentPalette, 2); + _screen->fadePalette(_screen->getPalette(0), 2); } void GUI_LoK::restorePalette() { if (_vm->gameFlags().platform == Common::kPlatformAmiga) return; - memcpy(_screen->_currentPalette, _screen->getPalette(2), 768); - _screen->fadePalette(_screen->_currentPalette, 2); + memcpy(_screen->getPalette(0), _screen->getPalette(2), 768); + _screen->fadePalette(_screen->getPalette(0), 2); } #pragma mark - |