[Scummvm-cvs-logs] SF.net SVN: scummvm:[50091] scummvm/trunk/engines/sci/graphics/palette.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 50091
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50091&view=rev
Author:   m_kiewitz
Date:     2010-06-20 19:18:33 +0000 (Sun, 20 Jun 2010)

Log Message:
-----------
SCI: cleanup of SciPalette

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/palette.cpp

Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp	2010-06-20 18:22:49 UTC (rev 50090)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-06-20 19:18:33 UTC (rev 50091)
@@ -342,8 +342,6 @@
 }
 
 void GfxPalette::setOnScreen() {
-//	if (pal != &_sysPalette)
-//		memcpy(&_sysPalette,pal,sizeof(Palette));
 	// We dont change palette at all times for amiga
 	if (_resMan->isAmiga32color())
 		return;
@@ -355,7 +353,7 @@
 }
 
 bool GfxPalette::kernelSetFromResource(GuiResourceId resourceId, bool force) {
-	Resource *palResource = _resMan->findResource(ResourceId(kResourceTypePalette, resourceId), 0);
+	Resource *palResource = _resMan->findResource(ResourceId(kResourceTypePalette, resourceId), false);
 	Palette palette;
 
 	if (palResource) {
@@ -496,13 +494,11 @@
 }
 
 bool GfxPalette::kernelPalVaryInit(GuiResourceId resourceId, uint16 ticks, uint16 stepStop, uint16 direction) {
-	//kernelSetFromResource(resourceId, true);
-	//return;
 	if (_palVaryResourceId != -1)	// another palvary is taking place, return
 		return false;
 
 	_palVaryResourceId = resourceId;
-	Resource *palResource = _resMan->findResource(ResourceId(kResourceTypePalette, resourceId), 0);
+	Resource *palResource = _resMan->findResource(ResourceId(kResourceTypePalette, resourceId), false);
 	if (palResource) {
 		// Load and initialize destination palette
 		createFromData(palResource->data, &_palVaryTargetPalette);


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