ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced some raw palette loads.

Browse Source 
svn-id: r41951
This commit is contained in:
Johannes Schickel
2009-06-29 16:49:26 +00:00
parent 80a4a2dd8e
commit bfe8ec6d66
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/kyra/kyra_hof.cpp
+3 -3
View File
@@ -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);
}
engines/kyra/script_hof.cpp
+1 -1
View File
@@ -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);