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_hof.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_hof.cpp')
| -rw-r--r-- | engines/kyra/scene_hof.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/scene_hof.cpp b/engines/kyra/scene_hof.cpp index 0300bf3a09..e6f1336989 100644 --- a/engines/kyra/scene_hof.cpp +++ b/engines/kyra/scene_hof.cpp @@ -670,13 +670,13 @@ void KyraEngine_HoF::initSceneScreen(int unk1) { if (_noScriptEnter) { memset(_screen->getPalette(0).getData(), 0, 384); - _screen->setScreenPalette(_screen->getPalette(0).getData()); + _screen->setScreenPalette(_screen->getPalette(0)); } _screen->copyRegion(0, 0, 0, 0, 320, 144, 2, 0, Screen::CR_NO_P_CHECK); if (_noScriptEnter) { - _screen->setScreenPalette(_screen->getPalette(1).getData()); + _screen->setScreenPalette(_screen->getPalette(1)); _screen->getPalette(0).copy(_screen->getPalette(1), 0, 128); } @@ -696,7 +696,7 @@ void KyraEngine_HoF::freeSceneShapePtrs() { void KyraEngine_HoF::fadeScenePal(int srcIndex, int delayTime) { _screen->getPalette(0).copy(_scenePal, srcIndex << 4, 16, 112); - _screen->fadePalette(_screen->getPalette(0).getData(), delayTime, &_updateFunctor); + _screen->fadePalette(_screen->getPalette(0), delayTime, &_updateFunctor); } #pragma mark - |