Use Screen::loadPalette instead of Resource::loadFileToBuf.

svn-id: r41877
This commit is contained in:
Johannes Schickel 2009-06-25 19:53:55 +00:00
parent 55cb0c6738
commit dca6ec2653
5 changed files with 6 additions and 6 deletions

View File

@ -367,7 +367,7 @@ int KyraEngine_HoF::bookButton(Button *button) {
_screen->copyPalette(2, 0);
_screen->fadeToBlack(7, &_updateFunctor);
_res->loadFileToBuf("_BOOK.COL", _screen->getPalette(0).getData(), 768);
_screen->loadPalette("_BOOK.COL", _screen->getPalette(0));
loadBookBkgd();
showBookPage();
_screen->copyRegion(0, 0, 0, 0, 0x140, 0xC8, 2, 0, Screen::CR_NO_P_CHECK);

View File

@ -680,7 +680,7 @@ void KyraEngine_MR::showAlbum() {
int itemInHand = _itemInHand;
removeHandItem();
_res->loadFileToBuf("ALBUM.COL", _screen->getPalette(0).getData(), 768);
_screen->loadPalette("ALBUM.COL", _screen->getPalette(0));
loadAlbumPage();
loadAlbumPageWSA();

View File

@ -415,7 +415,7 @@ void KyraEngine_HoF::startup() {
setupLangButtonShapes();
loadInventoryShapes();
_res->loadFileToBuf("PALETTE.COL", _screen->getPalette(0).getData(), 0x300);
_screen->loadPalette("PALETTE.COL", _screen->getPalette(0));
_screen->loadBitmap("_PLAYFLD.CPS", 3, 3, 0);
_screen->copyPage(3, 0);
_screen->showMouse();

View File

@ -230,7 +230,7 @@ Common::Error KyraEngine_MR::init() {
_screen->setAnimBlockPtr(3500);
_screen->setScreenDim(0);
_res->loadFileToBuf("PALETTE.COL", _screen->getPalette(0).getData(), 768);
_screen->loadPalette("PALETTE.COL", _screen->getPalette(0));
_screen->setScreenPalette(_screen->getPalette(0));
return Common::kNoError;
@ -626,7 +626,7 @@ void KyraEngine_MR::startup() {
loadInterfaceShapes();
musicUpdate(0);
_res->loadFileToBuf("PALETTE.COL", _screen->getPalette(0).getData(), 768);
_screen->loadPalette("PALETTE.COL", _screen->getPalette(0));
_paletteOverlay = new uint8[256];
_screen->generateOverlay(_screen->getPalette(0).getData(), _paletteOverlay, 0xF0, 0x19);

View File

@ -391,7 +391,7 @@ void LoLEngine::loadLevelGraphics(const char *file, int specialColor, int weight
memcpy(_screen->getPalette(0) + 384, tmpPal, 384);*/
if (_currentLevel == 11) {
_res->loadFileToBuf("SWAMPICE.COL", _screen->getPalette(2).getData(), 384);
_screen->loadPalette("SWAMPICE.COL", _screen->getPalette(2));
_screen->getPalette(2).copy(_screen->getPalette(0), 128);
if (_flagsTable[52] & 0x04) {