diff options
author | Johannes Schickel | 2009-06-29 16:08:16 +0000 |
---|---|---|
committer | Johannes Schickel | 2009-06-29 16:08:16 +0000 |
commit | c09985db2c8222feb2ab0aaa1aa2e562ce423141 (patch) | |
tree | 26e43408d41eda8c7ba3275848b9868c14831fc6 /engines/kyra/script_lol.cpp | |
parent | 3bde2647b6ebc4c596c98f8550b3b432441235da (diff) | |
download | scummvm-rg350-c09985db2c8222feb2ab0aaa1aa2e562ce423141.tar.gz scummvm-rg350-c09985db2c8222feb2ab0aaa1aa2e562ce423141.tar.bz2 scummvm-rg350-c09985db2c8222feb2ab0aaa1aa2e562ce423141.zip |
Change Screen_LoL::loadSpecialColors to take an Palette object as parameter.
svn-id: r41947
Diffstat (limited to 'engines/kyra/script_lol.cpp')
-rw-r--r-- | engines/kyra/script_lol.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp index df238742d6..109621f2a0 100644 --- a/engines/kyra/script_lol.cpp +++ b/engines/kyra/script_lol.cpp @@ -865,7 +865,7 @@ int LoLEngine::olol_fadeClearSceneWindow(EMCState *script) { int LoLEngine::olol_fadeSequencePalette(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_fadeSequencePalette(%p)", (const void *)script); _screen->getPalette(3).copy(_screen->getPalette(0), 128); - _screen->loadSpecialColors(_screen->getPalette(3).getData()); + _screen->loadSpecialColors(_screen->getPalette(3)); _screen->fadePalette(_screen->getPalette(3), 10); _screen->_fadeFlag = 0; return 1; @@ -2106,8 +2106,8 @@ int LoLEngine::olol_paletteFlash(EMCState *script) { uint8 ovl[256]; generateFlashPalette(p1.getData(), p2.getData(), stackPos(0)); - _screen->loadSpecialColors(p1.getData()); - _screen->loadSpecialColors(p2.getData()); + _screen->loadSpecialColors(p1); + _screen->loadSpecialColors(p2); if (_smoothScrollModeNormal) { for (int i = 0; i < 256; i++) @@ -2401,7 +2401,7 @@ int LoLEngine::tlol_fadeClearWindow(const TIM *tim, const uint16 *param) { case 1: _screen->getPalette(3).copy(_screen->getPalette(0), 128); - _screen->loadSpecialColors(_screen->getPalette(3).getData()); + _screen->loadSpecialColors(_screen->getPalette(3)); _screen->fadePalette(_screen->getPalette(3), 10); _screen->_fadeFlag = 0; break; @@ -2411,7 +2411,7 @@ int LoLEngine::tlol_fadeClearWindow(const TIM *tim, const uint16 *param) { break; case 3: - _screen->loadSpecialColors(_screen->getPalette(3).getData()); + _screen->loadSpecialColors(_screen->getPalette(3)); _screen->fadePalette(_screen->getPalette(3), 10); _screen->_fadeFlag = 0; break; @@ -2425,7 +2425,7 @@ int LoLEngine::tlol_fadeClearWindow(const TIM *tim, const uint16 *param) { break; case 5: - _screen->loadSpecialColors(_screen->getPalette(3).getData()); + _screen->loadSpecialColors(_screen->getPalette(3)); _screen->fadePalette(_screen->getPalette(1), 10); _screen->_fadeFlag = 0; break; |