aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2009-06-29 16:49:26 +0000
committerJohannes Schickel2009-06-29 16:49:26 +0000
commitbfe8ec6d668a3586ee101da671de73f5fc8bbac8 (patch)
tree356180987123cd1e109f1c3cecc45745bb870d93 /engines
parent80a4a2dd8e047298e7d7d385005a7049d25bc675 (diff)
downloadscummvm-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')
-rw-r--r--engines/kyra/kyra_hof.cpp6
-rw-r--r--engines/kyra/script_hof.cpp2
2 files changed, 4 insertions, 4 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);
}
diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp
index c874237667..1b8c1d32b3 100644
--- a/engines/kyra/script_hof.cpp
+++ b/engines/kyra/script_hof.cpp
@@ -780,7 +780,7 @@ int KyraEngine_HoF::o2_showLetter(EMCState *script) {
_screen->loadBitmap("_NOTE.CPS", 3, 3, 0);
sprintf(filename, "_NTEPAL%.1d.COL", letter+1);
- _res->loadFileToBuf(filename, _screen->getPalette(0).getData(), 768);
+ _screen->loadPalette(filename, _screen->getPalette(0));
_screen->fadeToBlack(0x14);