From dca6ec26539983fffdf6ae84c390f7dd30ef7ac2 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 25 Jun 2009 19:53:55 +0000
Subject: Use Screen::loadPalette instead of Resource::loadFileToBuf.

svn-id: r41877
---
 engines/kyra/gui_hof.cpp   | 2 +-
 engines/kyra/gui_mr.cpp    | 2 +-
 engines/kyra/kyra_hof.cpp  | 2 +-
 engines/kyra/kyra_mr.cpp   | 4 ++--
 engines/kyra/scene_lol.cpp | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/kyra/gui_hof.cpp b/engines/kyra/gui_hof.cpp
index 3c3559b2e7..2c3907f619 100644
--- a/engines/kyra/gui_hof.cpp
+++ b/engines/kyra/gui_hof.cpp
@@ -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);
diff --git a/engines/kyra/gui_mr.cpp b/engines/kyra/gui_mr.cpp
index f69337f52f..e7001ed31f 100644
--- a/engines/kyra/gui_mr.cpp
+++ b/engines/kyra/gui_mr.cpp
@@ -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();
 
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index 0a98d635a5..fcd3eb0b3b 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -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();
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index f5f6ea4c38..d0ab3808c0 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -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);
 
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index 2be5ce88ab..e5231e56aa 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -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) {
-- 
cgit v1.2.3