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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Thu Jun 25 21:54:41 CEST 2009


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

Log Message:
-----------
Replace yet another palette from file loading with Screen::loadPalette.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/seqplayer.cpp

Modified: scummvm/trunk/engines/kyra/seqplayer.cpp
===================================================================
--- scummvm/trunk/engines/kyra/seqplayer.cpp	2009-06-25 19:53:55 UTC (rev 41877)
+++ scummvm/trunk/engines/kyra/seqplayer.cpp	2009-06-25 19:54:41 UTC (rev 41878)
@@ -249,11 +249,7 @@
 
 		_screen->setScreenPalette(_screen->getPalette(0));
 	} else {
-		uint32 fileSize;
-		uint8 *srcData;
-		srcData = _res->fileData(_vm->seqCOLTable()[colNum], &fileSize);
-		memcpy(_screen->getPalette(0).getData(), srcData, fileSize);
-		delete[] srcData;
+		_screen->loadPalette(_vm->seqCOLTable()[colNum], _screen->getPalette(0));
 	}
 }
 


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




More information about the Scummvm-git-logs mailing list