More renaming

svn-id: r47009

1 files changed, 0 insertions, 973 deletions

diff --git a/engines/sci/graphics/gui_picture.cpp b/engines/sci/graphics/gui_picture.cpp
deleted file mode 100644
index 8505233a2c..0000000000
--- a/engines/sci/graphics/gui_picture.cpp
+++ /dev/null
@@ -1,973 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "common/stack.h"
-#include "sci/sci.h"
-#include "sci/engine/state.h"
-#include "sci/graphics/gui_screen.h"
-#include "sci/graphics/gui_palette.h"
-#include "sci/graphics/gui_gfx.h"
-#include "sci/graphics/gui_picture.h"
-
-namespace Sci {
-
-SciGuiPicture::SciGuiPicture(ResourceManager *resMan, SciGuiGfx *gfx, SciGuiScreen *screen, SciGuiPalette *palette, GuiResourceId resourceId)
-	: _resMan(resMan), _gfx(gfx), _screen(screen), _palette(palette), _resourceId(resourceId) {
-	assert(resourceId != -1);
-	initData(resourceId);
-}
-
-SciGuiPicture::~SciGuiPicture() {
-}
-
-void SciGuiPicture::initData(GuiResourceId resourceId) {
-	_resource = _resMan->findResource(ResourceId(kResourceTypePic, resourceId), false);
-	if (!_resource) {
-		error("picture resource %d not found", resourceId);
-	}
-}
-
-GuiResourceId SciGuiPicture::getResourceId() {
-	return _resourceId;
-}
-
-// TODO: subclass this
-void SciGuiPicture::draw(int16 animationNr, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo) {
-	uint16 headerSize;
-
-	_animationNr = animationNr;
-	_mirroredFlag = mirroredFlag;
-	_addToFlag = addToFlag;
-	_EGApaletteNo = EGApaletteNo;
-	_priority = 0;
-
-	headerSize = READ_LE_UINT16(_resource->data);
-	switch (headerSize) {
-	case 0x26: // SCI 1.1 VGA picture
-		drawSci11Vga();
-		break;
-#ifdef ENABLE_SCI32
-	case 0x0e: // SCI32 VGA picture
-		drawSci32Vga();
-		break;
-#endif
-	default:
-		// VGA, EGA or Amiga vector data
-		drawVectorData(_resource->data, _resource->size);
-	}
-}
-
-void SciGuiPicture::reset() {
-	int16 x, y;
-	for (y = _gfx->GetPort()->top; y < _screen->_height; y++) {
-		for (x = 0; x < _screen->_width; x++) {
-			_screen->putPixel(x, y, SCI_SCREEN_MASK_ALL, 255, 0, 0);
-		}
-	}
-}
-
-void SciGuiPicture::drawSci11Vga() {
-	byte *inbuffer = _resource->data;
-	int size = _resource->size;
-	int has_cel = READ_LE_UINT16(inbuffer + 4);
-	int vector_dataPos = READ_LE_UINT16(inbuffer + 16);
-	int vector_size = size - vector_dataPos;
-	int palette_data_ptr = READ_LE_UINT16(inbuffer + 28);
-	int cel_headerPos = READ_LE_UINT16(inbuffer + 32);
-	int cel_RlePos = READ_LE_UINT16(inbuffer + cel_headerPos + 24);
-	int cel_LiteralPos = READ_LE_UINT16(inbuffer + cel_headerPos + 28);
-	GuiPalette palette;
-
-	// Create palette and set it
-	_palette->createFromData(inbuffer + palette_data_ptr, &palette);
-	_palette->set(&palette, 2);
-
-	// display Cel-data
-	if (has_cel) {
-		drawCelData(inbuffer, size, cel_headerPos, cel_RlePos, cel_LiteralPos, 0, 0, false);
-	}
-
-	// process vector data
-	drawVectorData(inbuffer + vector_dataPos, vector_size);
-}
-
-#ifdef ENABLE_SCI32
-void SciGuiPicture::drawSci32Vga() {
-	byte *inbuffer = _resource->data;
-	int size = _resource->size;
-	int header_size = READ_LE_UINT16(inbuffer);
-	int palette_data_ptr = READ_LE_UINT16(inbuffer + 6);
-	int cel_headerPos = header_size;
-	int cel_RlePos = READ_LE_UINT16(inbuffer + cel_headerPos + 24);
-	int cel_LiteralPos = READ_LE_UINT16(inbuffer + cel_headerPos + 28);
-	GuiPalette palette;
-
-	// Create palette and set it
-	_palette->createFromData(inbuffer + palette_data_ptr, &palette);
-	_palette->set(&palette, 2);
-
-	drawCelData(inbuffer, size, cel_headerPos, cel_RlePos, cel_LiteralPos, 0, 0, true);
-
-	// TODO: find out where priority map is stored
-}
-#endif
-
-void SciGuiPicture::drawCelData(byte *inbuffer, int size, int headerPos, int rlePos, int literalPos, int16 callerX, int16 callerY, bool hasSci32Header) {
-	byte *celBitmap = NULL;
-	byte *ptr = NULL;
-	byte *headerPtr = inbuffer + headerPos;
-	byte *rlePtr = inbuffer + rlePos;
-	byte *literalPtr = inbuffer + literalPos;
-	uint16 width = READ_LE_UINT16(headerPtr + 0);
-	uint16 height = READ_LE_UINT16(headerPtr + 2);
-	int16 displaceX, displaceY;
-	byte priority = _addToFlag ? _priority : 0;
-	byte clearColor;
-	bool compression = true;
-	byte curByte, runLength;
-	int16 y, lastY, x, leftX, rightX;
-	uint16 pixelNr, pixelCount;
-
-#ifdef ENABLE_SCI32
-	if (!hasSci32Header) {
-#endif
-		displaceX = (signed char)headerPtr[4];
-		displaceY = (unsigned char)headerPtr[5];
-		clearColor = headerPtr[6];
-#ifdef ENABLE_SCI32
-	} else {
-		displaceX = READ_LE_UINT16(headerPtr + 4); // probably signed?!?
-		displaceY = READ_LE_UINT16(headerPtr + 6); // probably signed?!?
-		clearColor = headerPtr[8];
-		if (headerPtr[9] == 0)
-			compression = false;
-	}
-#endif
-
-	if (displaceX || displaceY)
-		error("unsupported embedded cel-data in picture");
-
-	pixelCount = width * height;
-	celBitmap = new byte[pixelCount];
-	if (!celBitmap)
-		error("Unable to allocate temporary memory for picture drawing");
-
-	if (compression) {
-		// We will unpack cel-data into a temporary buffer and then plot it to screen
-		//  That needs to be done cause a mirrored picture may be requested
-		memset(celBitmap, clearColor, pixelCount);
-		pixelNr = 0;
-		ptr = celBitmap;
-		if (literalPos == 0) {
-			// decompression for data that has only one stream (vecor embedded view data)
-			switch (_resMan->getViewType()) {
-			case kViewEga:
-				while (pixelNr < pixelCount) {
-					curByte = *rlePtr++;
-					runLength = curByte >> 4;
-					memset(ptr + pixelNr, curByte & 0x0F, MIN<uint16>(runLength, pixelCount - pixelNr));
-					pixelNr += runLength;
-				}
-				break;
-			case kViewVga:
-			case kViewVga11:
-				while (pixelNr < pixelCount) {
-					curByte = *rlePtr++;
-					runLength = curByte & 0x3F;
-					switch (curByte & 0xC0) {
-					case 0: // copy bytes as-is
-						while (runLength-- && pixelNr < pixelCount)
-							ptr[pixelNr++] = *rlePtr++;
-						break;
-					case 0x80: // fill with color
-						memset(ptr + pixelNr, *rlePtr++, MIN<uint16>(runLength, pixelCount - pixelNr));
-						pixelNr += runLength;
-						break;
-					case 0xC0: // fill with transparent
-						pixelNr += runLength;
-						break;
-					}
-				}
-				break;
-			case kViewAmiga:
-				while (pixelNr < pixelCount) {
-					curByte = *rlePtr++;
-					if (curByte & 0x07) { // fill with color
-						runLength = curByte & 0x07;
-						curByte = curByte >> 3;
-						while (runLength-- && pixelNr < pixelCount) {
-							ptr[pixelNr++] = curByte;
-						}
-					} else { // fill with transparent
-						runLength = curByte >> 3;
-						pixelNr += runLength;
-					}
-				}
-				break;
-
-			default:
-				error("Unsupported picture viewtype");
-			}
-		} else {
-			// decompression for data that has two separate streams (probably SCI 1.1 picture)
-			while (pixelNr < pixelCount) {
-				curByte = *rlePtr++;
-				runLength = curByte & 0x3F;
-				switch (curByte & 0xC0) {
-				case 0: // copy bytes as-is
-					while (runLength-- && pixelNr < pixelCount)
-						ptr[pixelNr++] = *literalPtr++;
-					break;
-				case 0x80: // fill with color
-					memset(ptr + pixelNr, *literalPtr++, MIN<uint16>(runLength, pixelCount - pixelNr));
-					pixelNr += runLength;
-					break;
-				case 0xC0: // fill with transparent
-					pixelNr += runLength;
-					break;
-				}
-			}
-		}
-	} else {
-		// No compression (some SCI32 pictures)
-		memcpy(celBitmap, rlePtr, pixelCount);
-	}
-
-	// Set initial vertical coordinate by using current port
-	y = callerY + _gfx->GetPort()->top;
-	lastY = MIN<int16>(height + y, _gfx->GetPort()->rect.bottom + _gfx->GetPort()->top);
-	leftX = callerX + _gfx->GetPort()->left;
-	rightX = MIN<int16>(width + leftX, _gfx->GetPort()->rect.right + _gfx->GetPort()->left);
-
-	// Change clearcolor to white, if we dont add to an existing picture. That way we will paint everything on screen
-	//  but white and that wont matter because the screen is supposed to be already white. It seems that most (if not all)
-	//  SCI1.1 games use color 0 as transparency and SCI1 games use color 255 as transparency. Sierra SCI seems to paint
-	//  the whole data to screen and wont skip over transparent pixels. So this will actually make it work like Sierra
-	if (!_addToFlag)
-		clearColor = _screen->_colorWhite;
-
-	ptr = celBitmap;
-	if (!_mirroredFlag) {
-		// Draw bitmap to screen
-		x = leftX;
-		while (y < lastY) {
-			curByte = *ptr++;
-			if ((curByte != clearColor) && (priority >= _screen->getPriority(x, y)))
-				_screen->putPixel(x, y, SCI_SCREEN_MASK_VISUAL | SCI_SCREEN_MASK_PRIORITY, curByte, priority, 0);
-			x++;
-			if (x >= rightX) {
-				x = leftX; y++;
-			}
-		}
-	} else {
-		// Draw bitmap to screen (mirrored)
-		x = rightX - 1;
-		while (y < lastY) {
-			curByte = *ptr++;
-			if ((curByte != clearColor) && (priority >= _screen->getPriority(x, y)))
-				_screen->putPixel(x, y, SCI_SCREEN_MASK_VISUAL | SCI_SCREEN_MASK_PRIORITY, curByte, priority, 0);
-			if (x == leftX) {
-				x = rightX; y++;
-			}
-			x--;
-		}
-	}
-	delete[] celBitmap;
-}
-
-enum {
-	PIC_OP_SET_COLOR = 0xf0,
-	PIC_OP_DISABLE_VISUAL = 0xf1,
-	PIC_OP_SET_PRIORITY = 0xf2,
-	PIC_OP_DISABLE_PRIORITY = 0xf3,
-	PIC_OP_SHORT_PATTERNS = 0xf4,
-	PIC_OP_MEDIUM_LINES = 0xf5,
-	PIC_OP_LONG_LINES = 0xf6,
-	PIC_OP_SHORT_LINES = 0xf7,
-	PIC_OP_FILL = 0xf8,
-	PIC_OP_SET_PATTERN = 0xf9,
-	PIC_OP_ABSOLUTE_PATTERN = 0xfa,
-	PIC_OP_SET_CONTROL = 0xfb,
-	PIC_OP_DISABLE_CONTROL = 0xfc,
-	PIC_OP_MEDIUM_PATTERNS = 0xfd,
-	PIC_OP_OPX = 0xfe,
-	PIC_OP_TERMINATE = 0xff
-};
-#define PIC_OP_FIRST PIC_OP_SET_COLOR
-
-enum {
-	PIC_OPX_EGA_SET_PALETTE_ENTRIES = 0,
-	PIC_OPX_EGA_SET_PALETTE = 1,
-	PIC_OPX_EGA_MONO0 = 2,
-	PIC_OPX_EGA_MONO1 = 3,
-	PIC_OPX_EGA_MONO2 = 4,
-	PIC_OPX_EGA_MONO3 = 5,
-	PIC_OPX_EGA_MONO4 = 6,
-	PIC_OPX_EGA_EMBEDDED_VIEW = 7,
-	PIC_OPX_EGA_SET_PRIORITY_TABLE = 8
-};
-
-enum {
-	PIC_OPX_VGA_SET_PALETTE_ENTRIES = 0,
-	PIC_OPX_VGA_EMBEDDED_VIEW = 1,
-	PIC_OPX_VGA_SET_PALETTE = 2,
-	PIC_OPX_VGA_PRIORITY_TABLE_EQDIST = 3,
-	PIC_OPX_VGA_PRIORITY_TABLE_EXPLICIT = 4
-};
-
-#define PIC_EGAPALETTE_COUNT 4
-#define PIC_EGAPALETTE_SIZE  40
-#define PIC_EGAPALETTE_TOTALSIZE PIC_EGAPALETTE_COUNT*PIC_EGAPALETTE_SIZE
-#define PIC_EGAPRIORITY_SIZE PIC_EGAPALETTE_SIZE
-
-static const byte vector_defaultEGApalette[PIC_EGAPALETTE_SIZE] = {
-	0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
-	0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0x88,
-	0x88, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x88,
-	0x88, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
-	0x08, 0x91, 0x2a, 0x3b, 0x4c, 0x5d, 0x6e, 0x88
-};
-
-static const byte vector_defaultEGApriority[PIC_EGAPRIORITY_SIZE] = {
-	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-	0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-	0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
-};
-
-void SciGuiPicture::drawVectorData(byte *data, int dataSize) {
-	byte pic_op;
-	byte pic_color = _screen->_colorDefaultVectorData;
-	byte pic_priority = 255, pic_control = 255;
-	int16 x = 0, y = 0, oldx, oldy;
-	byte EGApalettes[PIC_EGAPALETTE_TOTALSIZE] = {0};
-	byte *EGApalette = &EGApalettes[_EGApaletteNo * PIC_EGAPALETTE_SIZE];
-	byte EGApriority[PIC_EGAPRIORITY_SIZE] = {0};
-	bool isEGA = false;
-	int curPos = 0;
-	uint16 size;
-	byte pixel;
-	int i;
-	GuiPalette palette;
-	int16 pattern_Code = 0, pattern_Texture = 0;
-
-	memset(&palette, 0, sizeof(palette));
-
-	if (_EGApaletteNo >= PIC_EGAPALETTE_COUNT)
-		_EGApaletteNo = 0;
-
-	if (_resMan->getViewType() == kViewEga) {
-		isEGA = true;
-		// setup default mapping tables
-		for (i = 0; i < PIC_EGAPALETTE_TOTALSIZE; i += PIC_EGAPALETTE_SIZE)
-			memcpy(&EGApalettes[i], &vector_defaultEGApalette, sizeof(vector_defaultEGApalette));
-		memcpy(&EGApriority, &vector_defaultEGApriority, sizeof(vector_defaultEGApriority));
-	}
-
-	// Drawing
-	while (curPos < dataSize) {
-		//warning("%X at %d", data[curPos], curPos);
-		switch (pic_op = data[curPos++]) {
-		case PIC_OP_SET_COLOR:
-			pic_color = data[curPos++];
-			if (isEGA) {
-				pic_color = EGApalette[pic_color];
-				pic_color ^= pic_color << 4;
-			}
-			break;
-		case PIC_OP_DISABLE_VISUAL:
-			pic_color = 0xFF;
-			break;
-
-		case PIC_OP_SET_PRIORITY:
-			pic_priority = data[curPos++] & 0x0F;
-			if (isEGA) {
-				pic_priority = EGApriority[pic_priority];
-			}
-			break;
-		case PIC_OP_DISABLE_PRIORITY:
-			pic_priority = 255;
-			break;
-
-		case PIC_OP_SET_CONTROL:
-			pic_control = data[curPos++] & 0x0F;
-			break;
-		case PIC_OP_DISABLE_CONTROL:
-			pic_control = 255;
-			break;
-
-		case PIC_OP_SHORT_LINES: // short line
-			vectorGetAbsCoords(data, curPos, x, y);
-			while (vectorIsNonOpcode(data[curPos])) {
-				oldx = x; oldy = y;
-				vectorGetRelCoords(data, curPos, x, y);
-				Common::Point startPoint(oldx, oldy);
-				Common::Point endPoint(x, y);
-				_gfx->OffsetLine(startPoint, endPoint);
-				_screen->drawLine(startPoint, endPoint, pic_color, pic_priority, pic_control);
-			}
-			break;
-		case PIC_OP_MEDIUM_LINES: // medium line
-			vectorGetAbsCoords(data, curPos, x, y);
-			while (vectorIsNonOpcode(data[curPos])) {
-				oldx = x; oldy = y;
-				vectorGetRelCoordsMed(data, curPos, x, y);
-				Common::Point startPoint(oldx, oldy);
-				Common::Point endPoint(x, y);
-				_gfx->OffsetLine(startPoint, endPoint);
-				_screen->drawLine(startPoint, endPoint, pic_color, pic_priority, pic_control);
-			}
-			break;
-		case PIC_OP_LONG_LINES: // long line
-			vectorGetAbsCoords(data, curPos, x, y);
-			while (vectorIsNonOpcode(data[curPos])) {
-				oldx = x; oldy = y;
-				vectorGetAbsCoords(data, curPos, x, y);
-				Common::Point startPoint(oldx, oldy);
-				Common::Point endPoint(x, y);
-				_gfx->OffsetLine(startPoint, endPoint);
-				_screen->drawLine(startPoint, endPoint, pic_color, pic_priority, pic_control);
-			}
-			break;
-
-		case PIC_OP_FILL: //fill
-			while (vectorIsNonOpcode(data[curPos])) {
-				vectorGetAbsCoords(data, curPos, x, y);
-				vectorFloodFill(x, y, pic_color, pic_priority, pic_control);
-			}
-			break;
-
-		case PIC_OP_SET_PATTERN:
-			pattern_Code = data[curPos++];
-			break;
-		case PIC_OP_SHORT_PATTERNS:
-			vectorGetPatternTexture(data, curPos, pattern_Code, pattern_Texture);
-			vectorGetAbsCoords(data, curPos, x, y);
-			vectorPattern(x, y, pic_color, pic_priority, pic_control, pattern_Code, pattern_Texture);
-			while (vectorIsNonOpcode(data[curPos])) {
-				vectorGetPatternTexture(data, curPos, pattern_Code, pattern_Texture);
-				vectorGetRelCoords(data, curPos, x, y);
-				vectorPattern(x, y, pic_color, pic_priority, pic_control, pattern_Code, pattern_Texture);
-			}
-			break;
-		case PIC_OP_MEDIUM_PATTERNS:
-			vectorGetPatternTexture(data, curPos, pattern_Code, pattern_Texture);
-			vectorGetAbsCoords(data, curPos, x, y);
-			vectorPattern(x, y, pic_color, pic_priority, pic_control, pattern_Code, pattern_Texture);
-			while (vectorIsNonOpcode(data[curPos])) {
-				vectorGetPatternTexture(data, curPos, pattern_Code, pattern_Texture);
-				vectorGetRelCoordsMed(data, curPos, x, y);
-				vectorPattern(x, y, pic_color, pic_priority, pic_control, pattern_Code, pattern_Texture);
-			}
-			break;
-		case PIC_OP_ABSOLUTE_PATTERN:
-			while (vectorIsNonOpcode(data[curPos])) {
-				vectorGetPatternTexture(data, curPos, pattern_Code, pattern_Texture);
-				vectorGetAbsCoords(data, curPos, x, y);
-				vectorPattern(x, y, pic_color, pic_priority, pic_control, pattern_Code, pattern_Texture);
-			}
-			break;
-
-		case PIC_OP_OPX: // Extended functions
-			if (isEGA) {
-				switch (pic_op = data[curPos++]) {
-				case PIC_OPX_EGA_SET_PALETTE_ENTRIES:
-					while (vectorIsNonOpcode(data[curPos])) {
-						pixel = data[curPos++];
-						if (pixel >= PIC_EGAPALETTE_TOTALSIZE) {
-							error("picture trying to write to invalid EGA-palette");
-						}
-						EGApalettes[pixel] = data[curPos++];
-					}
-					break;
-				case PIC_OPX_EGA_SET_PALETTE:
-					pixel = data[curPos++];
-					if (pixel >= PIC_EGAPALETTE_COUNT) {
-						error("picture trying to write to invalid palette %d", (int)pixel);
-					}
-					pixel *= PIC_EGAPALETTE_SIZE;
-					for (i = 0; i < PIC_EGAPALETTE_SIZE; i++) {
-						EGApalettes[pixel + i] = data[curPos++];
-					}
-					break;
-				case PIC_OPX_EGA_MONO0:
-					curPos += 41;
-					break;
-				case PIC_OPX_EGA_MONO1:
-				case PIC_OPX_EGA_MONO3:
-					curPos++;
-					break;
-				case PIC_OPX_EGA_MONO2:
-				case PIC_OPX_EGA_MONO4:
-					break;
-				case PIC_OPX_EGA_EMBEDDED_VIEW:
-					vectorGetAbsCoordsNoMirror(data, curPos, x, y);
-					size = READ_LE_UINT16(data + curPos); curPos += 2;
-					_priority = pic_priority; // set global priority so the cel gets drawn using current priority as well
-					drawCelData(data, _resource->size, curPos, curPos + 8, 0, x, y, false);
-					curPos += size;
-					break;
-				case PIC_OPX_EGA_SET_PRIORITY_TABLE:
-					_gfx->PriorityBandsInit(data + curPos);
-					curPos += 14;
-					break;
-				default:
-					error("Unsupported sci1 extended pic-operation %X", pic_op);
-				}
-			} else {
-				switch (pic_op = data[curPos++]) {
-				case PIC_OPX_VGA_SET_PALETTE_ENTRIES:
-					while (vectorIsNonOpcode(data[curPos])) {
-						curPos++; // skip commands
-					}
-					break;
-				case PIC_OPX_VGA_SET_PALETTE:
-					curPos += 256 + 4; // Skip over mapping and timestamp
-					for (i = 0; i < 256; i++) {
-						palette.colors[i].used = data[curPos++];
-						palette.colors[i].r = data[curPos++]; palette.colors[i].g = data[curPos++]; palette.colors[i].b = data[curPos++];
-					}
-					_palette->set(&palette, 2);
-					break;
-				case PIC_OPX_VGA_EMBEDDED_VIEW: // draw cel
-					vectorGetAbsCoordsNoMirror(data, curPos, x, y);
-					size = READ_LE_UINT16(data + curPos); curPos += 2;
-					_priority = pic_priority; // set global priority so the cel gets drawn using current priority as well
-					drawCelData(data, _resource->size, curPos, curPos + 8, 0, x, y, false);
-					curPos += size;
-					break;
-				case PIC_OPX_VGA_PRIORITY_TABLE_EQDIST:
-					_gfx->PriorityBandsInit(-1, READ_LE_UINT16(data + curPos), READ_LE_UINT16(data + curPos + 2));
-					curPos += 4;
-					break;
-				case PIC_OPX_VGA_PRIORITY_TABLE_EXPLICIT:
-					_gfx->PriorityBandsInit(data + curPos);
-					curPos += 14;
-					break;
-				default:
-					error("Unsupported sci1 extended pic-operation %X", pic_op);
-				}
-			}
-			break;
-		case PIC_OP_TERMINATE:
-			_priority = pic_priority;
-			// Dithering EGA pictures
-			if (isEGA) {
-				_screen->dither(_addToFlag);
-			}
-			return;
-		default:
-			error("Unsupported pic-operation %X", pic_op);
-		}
-		//printf("picop %X\n", pic_op);
-		// for debug purposes
-		//_screen->copyToScreen();
-		//g_system->updateScreen();
-		//g_system->delayMillis(500);
-	}
-	error("picture vector data without terminator");
-}
-
-bool SciGuiPicture::vectorIsNonOpcode(byte pixel) {
-	if (pixel >= PIC_OP_FIRST)
-		return false;
-	return true;
-}
-
-void SciGuiPicture::vectorGetAbsCoords(byte *data, int &curPos, int16 &x, int16 &y) {
-	byte pixel = data[curPos++];
-	x = data[curPos++] + ((pixel & 0xF0) << 4);
-	y = data[curPos++] + ((pixel & 0x0F) << 8);
-	if (_mirroredFlag) x = 319 - x;
-}
-
-void SciGuiPicture::vectorGetAbsCoordsNoMirror(byte *data, int &curPos, int16 &x, int16 &y) {
-	byte pixel = data[curPos++];
-	x = data[curPos++] + ((pixel & 0xF0) << 4);
-	y = data[curPos++] + ((pixel & 0x0F) << 8);
-}
-
-void SciGuiPicture::vectorGetRelCoords(byte *data, int &curPos, int16 &x, int16 &y) {
-	byte pixel = data[curPos++];
-	if (pixel & 0x80) {
-		x -= ((pixel >> 4) & 7) * (_mirroredFlag ? -1 : 1);
-	} else {
-		x += (pixel >> 4) * (_mirroredFlag ? -1 : 1);
-	}
-	if (pixel & 0x08) {
-		y -= (pixel & 7);
-	} else {
-		y += (pixel & 7);
-	}
-}
-
-void SciGuiPicture::vectorGetRelCoordsMed(byte *data, int &curPos, int16 &x, int16 &y) {
-	byte pixel = data[curPos++];
-	if (pixel & 0x80) {
-		y -= (pixel & 0x7F);
-	} else {
-		y += pixel;
-	}
-	pixel = data[curPos++];
-	if (pixel & 0x80) {
-		x -= (128 - (pixel & 0x7F)) * (_mirroredFlag ? -1 : 1);
-	} else {
-		x += pixel * (_mirroredFlag ? -1 : 1);
-	}
-}
-
-void SciGuiPicture::vectorGetPatternTexture(byte *data, int &curPos, int16 pattern_Code, int16 &pattern_Texture) {
-	if (pattern_Code & SCI_PATTERN_CODE_USE_TEXTURE) {
-		pattern_Texture = (data[curPos++] >> 1) & 0x7f;
-	}
-}
-
-// Do not replace w/ some generic code. This algo really needs to behave exactly as the one from sierra
-void SciGuiPicture::vectorFloodFill(int16 x, int16 y, byte color, byte priority, byte control) {
-	GuiPort *curPort = _gfx->GetPort();
-	Common::Stack<Common::Point> stack;
-	Common::Point p, p1;
-	byte screenMask = _screen->getDrawingMask(color, priority, control);
-	byte matchedMask, matchMask;
-	int16 w, e, a_set, b_set;
-
-	p.x = x + curPort->left;
-	p.y = y + curPort->top;
-	stack.push(p);
-
-	byte searchColor = _screen->getVisual(p.x, p.y);
-	byte searchPriority = _screen->getPriority(p.x, p.y);
-	byte searchControl = _screen->getControl(p.x, p.y);
-
-	// This logic was taken directly from sierra sci, floodfill will get aborted on various occations
-	if (screenMask & SCI_SCREEN_MASK_VISUAL) {
-		if ((color == _screen->_colorWhite) || (searchColor != _screen->_colorWhite))
-			return;
-	} else if (screenMask & SCI_SCREEN_MASK_PRIORITY) {
-		if ((priority == 0) || (searchPriority != 0))
-			return;
-	} else if (screenMask & SCI_SCREEN_MASK_CONTROL) {
-		if ((control == 0) || (searchControl != 0))
-			return;
-	}
-
-	// Now remove screens, that already got the right color/priority/control
-	if ((screenMask & SCI_SCREEN_MASK_VISUAL) && (searchColor == color))
-		screenMask ^= SCI_SCREEN_MASK_VISUAL;
-	if ((screenMask & SCI_SCREEN_MASK_PRIORITY) && (searchPriority == priority))
-		screenMask ^= SCI_SCREEN_MASK_PRIORITY;
-	if ((screenMask & SCI_SCREEN_MASK_CONTROL) && (searchControl == control))
-		screenMask ^= SCI_SCREEN_MASK_CONTROL;
-
-	// Exit, if no screens left
-	if (!screenMask)
-		return;
-
-	if (screenMask & SCI_SCREEN_MASK_VISUAL) {
-		matchMask = SCI_SCREEN_MASK_VISUAL;
-	} else if (screenMask & SCI_SCREEN_MASK_PRIORITY) {
-		matchMask = SCI_SCREEN_MASK_PRIORITY;
-	} else {
-		matchMask = SCI_SCREEN_MASK_CONTROL;
-	}
-
-	// hard borders for filling
-	int l = curPort->rect.left + curPort->left;
-	int t = curPort->rect.top + curPort->top;
-	int r = curPort->rect.right + curPort->left - 1;
-	int b = curPort->rect.bottom + curPort->top - 1;
-	while (stack.size()) {
-		p = stack.pop();
-		if ((matchedMask = _screen->isFillMatch(p.x, p.y, matchMask, searchColor, searchPriority, searchControl)) == 0) // already filled
-			continue;
-		_screen->putPixel(p.x, p.y, screenMask, color, priority, control);
-		w = p.x;
-		e = p.x;
-		// moving west and east pointers as long as there is a matching color to fill
-		while (w > l && (matchedMask = _screen->isFillMatch(w - 1, p.y, matchMask, searchColor, searchPriority, searchControl)))
-			_screen->putPixel(--w, p.y, screenMask, color, priority, control);
-		while (e < r && (matchedMask = _screen->isFillMatch(e + 1, p.y, matchMask, searchColor, searchPriority, searchControl)))
-			_screen->putPixel(++e, p.y, screenMask, color, priority, control);
-		// checking lines above and below for possible flood targets
-		a_set = b_set = 0;
-		while (w <= e) {
-			if (p.y > t && (matchedMask = _screen->isFillMatch(w, p.y - 1, matchMask, searchColor, searchPriority, searchControl))) { // one line above
-				if (a_set == 0) {
-					p1.x = w;
-					p1.y = p.y - 1;
-					stack.push(p1);
-					a_set = 1;
-				}
-			} else
-				a_set = 0;
-
-			if (p.y < b && (matchedMask = _screen->isFillMatch(w, p.y + 1, matchMask, searchColor, searchPriority, searchControl))) { // one line below
-				if (b_set == 0) {
-					p1.x = w;
-					p1.y = p.y + 1;
-					stack.push(p1);
-					b_set = 1;
-				}
-			} else
-				b_set = 0;
-			w++;
-		}
-	}
-}
-
-// Bitmap for drawing sierra circles
-static const byte vectorPatternCircles[8][30] = {
-	{ 0x01 },
-	{ 0x72, 0x02 },
-	{ 0xCE, 0xF7, 0x7D, 0x0E },
-	{ 0x1C, 0x3E, 0x7F, 0x7F, 0x7F, 0x3E, 0x1C, 0x00 },
-	{ 0x38, 0xF8, 0xF3, 0xDF, 0x7F, 0xFF, 0xFD, 0xF7, 0x9F, 0x3F, 0x38 },
-	{ 0x70, 0xC0, 0x1F, 0xFE, 0xE3, 0x3F, 0xFF, 0xF7, 0x7F, 0xFF, 0xE7, 0x3F, 0xFE, 0xC3, 0x1F, 0xF8, 0x00 },
-	{ 0xF0, 0x01, 0xFF, 0xE1, 0xFF, 0xF8, 0x3F, 0xFF, 0xDF, 0xFF, 0xF7, 0xFF, 0xFD, 0x7F, 0xFF, 0x9F, 0xFF,
-		0xE3, 0xFF, 0xF0, 0x1F, 0xF0, 0x01 },
-	{ 0xE0, 0x03, 0xF8, 0x0F, 0xFC, 0x1F, 0xFE, 0x3F, 0xFE, 0x3F, 0xFF, 0x7F, 0xFF, 0x7F, 0xFF, 0x7F, 0xFF,
-		0x7F, 0xFF, 0x7F, 0xFE, 0x3F, 0xFE, 0x3F, 0xFC, 0x1F, 0xF8, 0x0F, 0xE0, 0x03 }
-//  { 0x01 };
-//	{ 0x03, 0x03, 0x03 },
-//	{ 0x02, 0x07, 0x07, 0x07, 0x02 },
-//	{ 0x06, 0x06, 0x0F, 0x0F, 0x0F, 0x06, 0x06 },
-//	{ 0x04, 0x0E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x04 },
-//	{ 0x0C, 0x1E, 0x1E, 0x1E, 0x3F, 0x3F, 0x3F, 0x1E, 0x1E, 0x1E, 0x0C },
-//	{ 0x1C, 0x3E, 0x3E, 0x3E, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x3E, 0x3E, 0x3E, 0x1C },
-//	{ 0x18, 0x3C, 0x7E, 0x7E, 0x7E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7E, 0x7E, 0x7E, 0x3C, 0x18 }
-};
-
-// TODO: perhaps this is a better way to set the s_patternTextures array below?
-//  in that case one would need to adjust bits of secondary table. Bit 256 is ignored by original interpreter
-#if 0
-static const byte patternTextures[32 * 2] = {
-	0x04, 0x29, 0x40, 0x24, 0x09, 0x41, 0x25, 0x45,
-	0x41, 0x90, 0x50, 0x44, 0x48, 0x08, 0x42, 0x28,
-	0x89, 0x52, 0x89, 0x88, 0x10, 0x48, 0xA4, 0x08,
-	0x44, 0x15, 0x28, 0x24, 0x00, 0x0A, 0x24, 0x20,
-	// Now the table is actually duplicated, so we won't need to wrap around
-	0x04, 0x29, 0x40, 0x24, 0x09, 0x41, 0x25, 0x45,
-	0x41, 0x90, 0x50, 0x44, 0x48, 0x08, 0x42, 0x28,
-	0x89, 0x52, 0x89, 0x88, 0x10, 0x48, 0xA4, 0x08,
-	0x44, 0x15, 0x28, 0x24, 0x00, 0x0A, 0x24, 0x20,
-};
-#endif
-
-// This table is bitwise upwards (from bit0 to bit7), sierras original table went down the bits (bit7 to bit0)
-//  this was done to simplify things, so we can just run through the table w/o worrying too much about clipping
-static const bool vectorPatternTextures[32 * 8 * 2] = {
-	false, false,  true, false, false, false, false, false, // 0x04
-	 true, false, false,  true, false,  true, false, false, // 0x29
-	false, false, false, false, false, false,  true, false, // 0x40
-	false, false,  true, false, false,  true, false, false, // 0x24
-	 true, false, false,  true, false, false, false, false, // 0x09
-	 true, false, false, false, false, false,  true, false, // 0x41
-	 true, false,  true, false, false,  true, false, false, // 0x25
-	 true, false,  true, false, false, false,  true, false, // 0x45
-	 true, false, false, false, false, false,  true, false, // 0x41
-	false, false, false, false,  true, false, false,  true, // 0x90
-	false, false, false, false,  true, false,  true, false, // 0x50
-	false, false,  true, false, false, false,  true, false, // 0x44
-	false, false, false,  true, false, false,  true, false, // 0x48
-	false, false, false,  true, false, false, false, false, // 0x08
-	false,  true, false, false, false, false,  true, false, // 0x42
-	false, false, false,  true, false,  true, false, false, // 0x28
-	 true, false, false,  true, false, false, false,  true, // 0x89
-	false,  true, false, false,  true, false,  true, false, // 0x52
-	 true, false, false,  true, false, false, false,  true, // 0x89
-	false, false, false,  true, false, false, false,  true, // 0x88
-	false, false, false, false,  true, false, false, false, // 0x10
-	false, false, false,  true, false, false,  true, false, // 0x48
-	false, false,  true, false, false,  true, false,  true, // 0xA4
-	false, false, false,  true, false, false, false, false, // 0x08
-	false, false,  true, false, false, false,  true, false, // 0x44
-	 true, false,  true, false,  true, false, false, false, // 0x15
-	false, false, false,  true, false,  true, false, false, // 0x28
-	false, false,  true, false, false,  true, false, false, // 0x24
-	false, false, false, false, false, false, false, false, // 0x00
-	false,  true, false,  true, false, false, false, false, // 0x0A
-	false, false,  true, false, false,  true, false, false, // 0x24
-	false, false, false, false, false,  true, false,        // 0x20 (last bit is not mentioned cause original interpreter also ignores that bit)
-	// Now the table is actually duplicated, so we won't need to wrap around
-	false, false,  true, false, false, false, false, false, // 0x04
-	 true, false, false,  true, false,  true, false, false, // 0x29
-	false, false, false, false, false, false,  true, false, // 0x40
-	false, false,  true, false, false,  true, false, false, // 0x24
-	 true, false, false,  true, false, false, false, false, // 0x09
-	 true, false, false, false, false, false,  true, false, // 0x41
-	 true, false,  true, false, false,  true, false, false, // 0x25
-	 true, false,  true, false, false, false,  true, false, // 0x45
-	 true, false, false, false, false, false,  true, false, // 0x41
-	false, false, false, false,  true, false, false,  true, // 0x90
-	false, false, false, false,  true, false,  true, false, // 0x50
-	false, false,  true, false, false, false,  true, false, // 0x44
-	false, false, false,  true, false, false,  true, false, // 0x48
-	false, false, false,  true, false, false, false, false, // 0x08
-	false,  true, false, false, false, false,  true, false, // 0x42
-	false, false, false,  true, false,  true, false, false, // 0x28
-	 true, false, false,  true, false, false, false,  true, // 0x89
-	false,  true, false, false,  true, false,  true, false, // 0x52
-	 true, false, false,  true, false, false, false,  true, // 0x89
-	false, false, false,  true, false, false, false,  true, // 0x88
-	false, false, false, false,  true, false, false, false, // 0x10
-	false, false, false,  true, false, false,  true, false, // 0x48
-	false, false,  true, false, false,  true, false,  true, // 0xA4
-	false, false, false,  true, false, false, false, false, // 0x08
-	false, false,  true, false, false, false,  true, false, // 0x44
-	 true, false,  true, false,  true, false, false, false, // 0x15
-	false, false, false,  true, false,  true, false, false, // 0x28
-	false, false,  true, false, false,  true, false, false, // 0x24
-	false, false, false, false, false, false, false, false, // 0x00
-	false,  true, false,  true, false, false, false, false, // 0x0A
-	false, false,  true, false, false,  true, false, false, // 0x24
-	false, false, false, false, false,  true, false,        // 0x20 (last bit is not mentioned cause original interpreter also ignores that bit)
-};
-
-// Bit offsets into pattern_textures
-static const byte vectorPatternTextureOffset[128] = {
-	0x00, 0x18, 0x30, 0xc4, 0xdc, 0x65, 0xeb, 0x48,
-	0x60, 0xbd, 0x89, 0x05, 0x0a, 0xf4, 0x7d, 0x7d,
-	0x85, 0xb0, 0x8e, 0x95, 0x1f, 0x22, 0x0d, 0xdf,
-	0x2a, 0x78, 0xd5, 0x73, 0x1c, 0xb4, 0x40, 0xa1,
-	0xb9, 0x3c, 0xca, 0x58, 0x92, 0x34, 0xcc, 0xce,
-	0xd7, 0x42, 0x90, 0x0f, 0x8b, 0x7f, 0x32, 0xed,
-	0x5c, 0x9d, 0xc8, 0x99, 0xad, 0x4e, 0x56, 0xa6,
-	0xf7, 0x68, 0xb7, 0x25, 0x82, 0x37, 0x3a, 0x51,
-	0x69, 0x26, 0x38, 0x52, 0x9e, 0x9a, 0x4f, 0xa7,
-	0x43, 0x10, 0x80, 0xee, 0x3d, 0x59, 0x35, 0xcf,
-	0x79, 0x74, 0xb5, 0xa2, 0xb1, 0x96, 0x23, 0xe0,
-	0xbe, 0x05, 0xf5, 0x6e, 0x19, 0xc5, 0x66, 0x49,
-	0xf0, 0xd1, 0x54, 0xa9, 0x70, 0x4b, 0xa4, 0xe2,
-	0xe6, 0xe5, 0xab, 0xe4, 0xd2, 0xaa, 0x4c, 0xe3,
-	0x06, 0x6f, 0xc6, 0x4a, 0xa4, 0x75, 0x97, 0xe1
-};
-
-void SciGuiPicture::vectorPatternBox(Common::Rect box, byte color, byte prio, byte control) {
-	byte flag = _screen->getDrawingMask(color, prio, control);
-	int y, x;
-
-	for (y = box.top; y < box.bottom; y++) {
-		for (x = box.left; x < box.right; x++) {
-			_screen->putPixel(x, y, flag, color, prio, control);
-		}
-	}
-}
-
-void SciGuiPicture::vectorPatternTexturedBox(Common::Rect box, byte color, byte prio, byte control, byte texture) {
-	byte flag = _screen->getDrawingMask(color, prio, control);
-	const bool *textureData = &vectorPatternTextures[vectorPatternTextureOffset[texture]];
-	int y, x;
-
-	for (y = box.top; y < box.bottom; y++) {
-		for (x = box.left; x < box.right; x++) {
-			if (*textureData) {
-				_screen->putPixel(x, y, flag, color, prio, control);
-			}
-			textureData++;
-		}
-	}
-}
-
-void SciGuiPicture::vectorPatternCircle(Common::Rect box, byte size, byte color, byte prio, byte control) {
-	byte flag = _screen->getDrawingMask(color, prio, control);
-	const byte *circleData = vectorPatternCircles[size];
-	byte bitmap = *circleData;
-	byte bitNo = 0;
-	int y, x;
-
-	for (y = box.top; y < box.bottom; y++) {
-		for (x = box.left; x < box.right; x++) {
-			if (bitmap & 1) {
-				_screen->putPixel(x, y, flag, color, prio, control);
-			}
-			bitNo++;
-			if (bitNo == 8) {
-				circleData++; bitmap = *circleData; bitNo = 0;
-			} else {
-				bitmap = bitmap >> 1;
-			}
-		}
-	}
-}
-
-void SciGuiPicture::vectorPatternTexturedCircle(Common::Rect box, byte size, byte color, byte prio, byte control, byte texture) {
-	byte flag = _screen->getDrawingMask(color, prio, control);
-	const byte *circleData = vectorPatternCircles[size];
-	byte bitmap = *circleData;
-	byte bitNo = 0;
-	const bool *textureData = &vectorPatternTextures[vectorPatternTextureOffset[texture]];
-	int y, x;
-
-	for (y = box.top; y < box.bottom; y++) {
-		for (x = box.left; x < box.right; x++) {
-			if (bitmap & 1) {
-				if (*textureData) {
-					_screen->putPixel(x, y, flag, color, prio, control);
-				}
-				textureData++;
-			}
-			bitNo++;
-			if (bitNo == 8) {
-				circleData++; bitmap = *circleData; bitNo = 0;
-			} else {
-				bitmap = bitmap >> 1;
-			}
-		}
-	}
-}
-
-void SciGuiPicture::vectorPattern(int16 x, int16 y, byte color, byte priority, byte control, byte code, byte texture) {
-	byte size = code & SCI_PATTERN_CODE_PENSIZE;
-	Common::Rect rect;
-
-	// We need to adjust the given coordinates, because the ones given us do not define upper left but somewhat middle
-	y -= size; if (y < 0) y = 0;
-	x -= size; if (x < 0) x = 0;
-
-	rect.top = y; rect.left = x;
-	rect.setHeight((size*2)+1); rect.setWidth((size*2)+2);
-	_gfx->OffsetRect(rect);
-	rect.clip(_screen->_width, _screen->_height);
-
-	if (code & SCI_PATTERN_CODE_RECTANGLE) {
-		// Rectangle
-		if (code & SCI_PATTERN_CODE_USE_TEXTURE) {
-			vectorPatternTexturedBox(rect, color, priority, control, texture);
-		} else {
-			vectorPatternBox(rect, color, priority, control);
-		}
-
-	} else {
-		// Circle
-		if (code & SCI_PATTERN_CODE_USE_TEXTURE) {
-			vectorPatternTexturedCircle(rect, size, color, priority, control, texture);
-		} else {
-			vectorPatternCircle(rect, size, color, priority, control);
-		}
-	}
-}
-
-} // End of namespace Sci