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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Mon Aug 16 18:50:45 CEST 2010


Revision: 52125
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52125&view=rev
Author:   m_kiewitz
Date:     2010-08-16 16:50:45 +0000 (Mon, 16 Aug 2010)

Log Message:
-----------
SCI: sci1.1 pictures w/o cel don't set palette

even if one is present in the picture, fixes some transitions looking weird in eq2 - bug #3037126

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

Modified: scummvm/trunk/engines/sci/graphics/picture.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/picture.cpp	2010-08-16 16:32:06 UTC (rev 52124)
+++ scummvm/trunk/engines/sci/graphics/picture.cpp	2010-08-16 16:50:45 UTC (rev 52125)
@@ -120,10 +120,6 @@
 	// [priorityBandData:WORD] * priorityBandCount
 	// [priority:BYTE] [unknown:BYTE]
 
-	// Create palette and set it
-	_palette->createFromData(inbuffer + palette_data_ptr, size - palette_data_ptr, &palette);
-	_palette->set(&palette, true);
-
 	// priority bands are supposed to be 14 for sci1.1 pictures
 	assert(priorityBandsCount == 14);
 
@@ -132,8 +128,13 @@
 	}
 
 	// display Cel-data
-	if (has_cel)
+	if (has_cel) {
+		// Create palette and set it
+		_palette->createFromData(inbuffer + palette_data_ptr, size - palette_data_ptr, &palette);
+		_palette->set(&palette, true);
+
 		drawCelData(inbuffer, size, cel_headerPos, cel_RlePos, cel_LiteralPos, 0, 0, 0);
+	}
 
 	// process vector data
 	drawVectorData(inbuffer + vector_dataPos, vector_size);


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