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

[lordhoto at users.sourceforge.net]

Revision: 41951
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41951&view=rev
Author:   lordhoto
Date:     2009-06-29 16:49:26 +0000 (Mon, 29 Jun 2009)

Log Message:
-----------
Replaced some raw palette loads.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_hof.cpp
    scummvm/trunk/engines/kyra/script_hof.cpp

Modified: scummvm/trunk/engines/kyra/kyra_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.cpp	2009-06-29 16:49:14 UTC (rev 41950)
+++ scummvm/trunk/engines/kyra/kyra_hof.cpp	2009-06-29 16:49:26 UTC (rev 41951)
@@ -1661,7 +1661,7 @@
 	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 @@
 	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);
 }

Modified: scummvm/trunk/engines/kyra/script_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_hof.cpp	2009-06-29 16:49:14 UTC (rev 41950)
+++ scummvm/trunk/engines/kyra/script_hof.cpp	2009-06-29 16:49:26 UTC (rev 41951)
@@ -780,7 +780,7 @@
 	_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);
 


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