From d8726d8058de846604810f5ab1c1193ea34ff388 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Mon, 16 Aug 2010 16:50:45 +0000
Subject: 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

svn-id: r52125
---
 engines/sci/graphics/picture.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'engines/sci/graphics/picture.cpp')

diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp
index e568316919..2765663381 100644
--- a/engines/sci/graphics/picture.cpp
+++ b/engines/sci/graphics/picture.cpp
@@ -120,10 +120,6 @@ void GfxPicture::drawSci11Vga() {
 	// [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 @@ void GfxPicture::drawSci11Vga() {
 	}
 
 	// 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);
-- 
cgit v1.2.3