diff options
| author | Johannes Schickel | 2009-06-29 16:49:26 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-06-29 16:49:26 +0000 |
| commit | bfe8ec6d668a3586ee101da671de73f5fc8bbac8 (patch) | |
| tree | 356180987123cd1e109f1c3cecc45745bb870d93 /engines/kyra/kyra_hof.cpp | |
| parent | 80a4a2dd8e047298e7d7d385005a7049d25bc675 (diff) | |
| download | scummvm-rg350-bfe8ec6d668a3586ee101da671de73f5fc8bbac8.tar.gz scummvm-rg350-bfe8ec6d668a3586ee101da671de73f5fc8bbac8.tar.bz2 scummvm-rg350-bfe8ec6d668a3586ee101da671de73f5fc8bbac8.zip | |
Replaced some raw palette loads.
svn-id: r41951
Diffstat (limited to 'engines/kyra/kyra_hof.cpp')
| -rw-r--r-- | engines/kyra/kyra_hof.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp index fcd3eb0b3b..20fb0396d8 100644 --- a/engines/kyra/kyra_hof.cpp +++ b/engines/kyra/kyra_hof.cpp @@ -1661,7 +1661,7 @@ void KyraEngine_HoF::setCauldronState(uint8 state, bool paletteFade) { if (!file) error("Couldn't load cauldron palette"); file->seek(state*18, SEEK_SET); - file->read(_screen->getPalette(2).getData() + 723, 18); + _screen->getPalette(0).loadVGAPalette(*file, 241, 6); delete file; file = 0; @@ -1833,11 +1833,11 @@ void KyraEngine_HoF::cauldronRndPaletteFade() { if (!file) error("Couldn't load cauldron palette"); file->seek(index*18, SEEK_SET); - file->read(_screen->getPalette(0).getData()+723, 18); + _screen->getPalette(0).loadVGAPalette(*file, 241, 6); snd_playSoundEffect(0x6A); _screen->fadePalette(_screen->getPalette(0), 0x1E, &_updateFunctor); file->seek(0, SEEK_SET); - file->read(_screen->getPalette(0).getData()+723, 18); + _screen->getPalette(0).loadVGAPalette(*file, 241, 6); delete file; _screen->fadePalette(_screen->getPalette(0), 0x1E, &_updateFunctor); } |