[Scummvm-cvs-logs] SF.net SVN: scummvm:[41877] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 41877
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41877&view=rev
Author:   lordhoto
Date:     2009-06-25 19:53:55 +0000 (Thu, 25 Jun 2009)

Log Message:
-----------
Use Screen::loadPalette instead of Resource::loadFileToBuf.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_hof.cpp
    scummvm/trunk/engines/kyra/gui_mr.cpp
    scummvm/trunk/engines/kyra/kyra_hof.cpp
    scummvm/trunk/engines/kyra/kyra_mr.cpp
    scummvm/trunk/engines/kyra/scene_lol.cpp

Modified: scummvm/trunk/engines/kyra/gui_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_hof.cpp	2009-06-25 19:52:49 UTC (rev 41876)
+++ scummvm/trunk/engines/kyra/gui_hof.cpp	2009-06-25 19:53:55 UTC (rev 41877)
@@ -367,7 +367,7 @@
 
 	_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);

Modified: scummvm/trunk/engines/kyra/gui_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_mr.cpp	2009-06-25 19:52:49 UTC (rev 41876)
+++ scummvm/trunk/engines/kyra/gui_mr.cpp	2009-06-25 19:53:55 UTC (rev 41877)
@@ -680,7 +680,7 @@
 	int itemInHand = _itemInHand;
 	removeHandItem();
 
-	_res->loadFileToBuf("ALBUM.COL", _screen->getPalette(0).getData(), 768);
+	_screen->loadPalette("ALBUM.COL", _screen->getPalette(0));
 	loadAlbumPage();
 	loadAlbumPageWSA();
 

Modified: scummvm/trunk/engines/kyra/kyra_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.cpp	2009-06-25 19:52:49 UTC (rev 41876)
+++ scummvm/trunk/engines/kyra/kyra_hof.cpp	2009-06-25 19:53:55 UTC (rev 41877)
@@ -415,7 +415,7 @@
 	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();

Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp	2009-06-25 19:52:49 UTC (rev 41876)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp	2009-06-25 19:53:55 UTC (rev 41877)
@@ -230,7 +230,7 @@
 	_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 @@
 	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);
 

Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp	2009-06-25 19:52:49 UTC (rev 41876)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp	2009-06-25 19:53:55 UTC (rev 41877)
@@ -391,7 +391,7 @@
 	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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.