diff options
| author | Johannes Schickel | 2009-06-22 02:36:54 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-06-22 02:36:54 +0000 |
| commit | 73ea378dee4e7ec31c7a898e7fcc3a65a9eb6cc1 (patch) | |
| tree | 6d00cd2c533aeefb72d874f59aa01b9d0e918db5 /engines/kyra/scene_lol.cpp | |
| parent | 4bb392b593c492299dd916784548dc56bc0b25cb (diff) | |
| download | scummvm-rg350-73ea378dee4e7ec31c7a898e7fcc3a65a9eb6cc1.tar.gz scummvm-rg350-73ea378dee4e7ec31c7a898e7fcc3a65a9eb6cc1.tar.bz2 scummvm-rg350-73ea378dee4e7ec31c7a898e7fcc3a65a9eb6cc1.zip | |
- Changed the following Screen functions to take a reference to a Palette object:
-> setScreenPalette
-> fadePalette
-> getFadeParams
-> fadePalStep
- Fixed initialization of 256 color palettes
svn-id: r41743
Diffstat (limited to 'engines/kyra/scene_lol.cpp')
| -rw-r--r-- | engines/kyra/scene_lol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp index cb628be48e..2be5ce88ab 100644 --- a/engines/kyra/scene_lol.cpp +++ b/engines/kyra/scene_lol.cpp @@ -1417,7 +1417,7 @@ void LoLEngine::prepareSpecialScene(int fieldType, int hasDialogue, int suspendG initDialogueSequence(fieldType, 0); if (fadeFlag) { - _screen->fadePalette(_screen->getPalette(3).getData(), 10); + _screen->fadePalette(_screen->getPalette(3), 10); _screen->_fadeFlag = 0; } @@ -1435,7 +1435,7 @@ void LoLEngine::prepareSpecialScene(int fieldType, int hasDialogue, int suspendG if (fadeFlag) { _screen->getPalette(3).copy(_screen->getPalette(0), 128); _screen->loadSpecialColors(_screen->getPalette(3).getData()); - _screen->fadePalette(_screen->getPalette(3).getData(), 10); + _screen->fadePalette(_screen->getPalette(3), 10); _screen->_fadeFlag = 0; } |