[Scummvm-cvs-logs] SF.net SVN: scummvm:[44571] scummvm/trunk/engines/sci/gui

[m_kiewitz at users.sourceforge.net]

Revision: 44571
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44571&view=rev
Author:   m_kiewitz
Date:     2009-10-03 21:27:00 +0000 (Sat, 03 Oct 2009)

Log Message:
-----------
SCI/newgui: Removed SciGUIpicture::drawPalette11

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_picture.cpp
    scummvm/trunk/engines/sci/gui/gui_picture.h

Modified: scummvm/trunk/engines/sci/gui/gui_picture.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_picture.cpp	2009-10-03 21:23:21 UTC (rev 44570)
+++ scummvm/trunk/engines/sci/gui/gui_picture.cpp	2009-10-03 21:27:00 UTC (rev 44571)
@@ -99,7 +99,6 @@
 	// Create palette and set it
 	_gfx->CreatePaletteFromData(inbuffer + palette_data_ptr, &palette);
 	_gfx->SetPalette(&palette, 2);
-//	drawPalette11(inbuffer + palette_data_ptr);
 
 	// display Cel-data
 	if (has_view) {
@@ -116,37 +115,6 @@
 	drawVectorData(inbuffer + vector_data_ptr, vector_size);
 }
 
-void SciGUIpicture::drawPalette11(byte *data) {
-	int start_color = data[25];
-	int format = data[32];
-	byte *pal_data = &data[37];
-	int colors_nr = READ_LE_UINT16(data + 29);
-	int i;
-	sciPalette palette = {0};
-
-	switch (format) {
-	case SCI_PAL_FORMAT_VARIABLE_FLAGS:
-		for (i = start_color; i < start_color + colors_nr; i ++) {
-			palette.colors[i].used = pal_data[0];
-			palette.colors[i].r = pal_data[1];
-			palette.colors[i].g = pal_data[2];
-			palette.colors[i].b = pal_data[3];
-			pal_data += 4;
-		}
-		break;
-	case SCI_PAL_FORMAT_CONSTANT_FLAGS:
-		for (i = start_color; i < start_color + colors_nr; i ++) {
-			palette.colors[i].used = 1;
-			palette.colors[i].r = pal_data[0];
-			palette.colors[i].g = pal_data[1];
-			palette.colors[i].b = pal_data[2];
-			pal_data += 3;
-		}
-		break;
-	}
-	_gfx->SetPalette(&palette, 2);
-}
-
 void SciGUIpicture::decodeRLE(byte *rledata, byte *pixeldata, byte *outbuffer, int size) {
 	int pos = 0;
 	byte nextbyte;

Modified: scummvm/trunk/engines/sci/gui/gui_picture.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_picture.h	2009-10-03 21:23:21 UTC (rev 44570)
+++ scummvm/trunk/engines/sci/gui/gui_picture.h	2009-10-03 21:27:00 UTC (rev 44571)
@@ -43,7 +43,6 @@
 	void reset();
 	void draw11();
 	void decodeRLE(byte *rledata, byte *pixeldata, byte *outbuffer, int size);
-	void drawPalette11(byte *data);
 	void drawCel(int16 x, int16 y, byte *pdata, int size);
 	void drawCelAmiga(int16 x, int16 y, byte *pdata, int size);
 	void drawVectorData(byte *data, int size);


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