DIRECTOR: Handle Ghost, Reverse ink types

2 files changed, 42 insertions, 2 deletions

diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 14965d4a7e..74285a6866 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -1076,6 +1076,12 @@ void Frame::renderSprites(Archive &_movie, Graphics::ManagedSurface &surface, Co
 			case kInkTypeMatte:
 				drawMatteSprite(surface, *img.getSurface(), drawRect);
 				break;
+			case kInkTypeGhost:
+				drawGhostSprite(surface, *img.getSurface(), drawRect);
+				break;
+			case kInkTypeReverse:
+				drawReverseSprite(surface, *img.getSurface(), drawRect);
+				break;
 			default:
 				warning("Unhandled ink type %d", _sprites[i]->_ink);
 				surface.blitFrom(*img.getSurface(), Common::Point(x, y));
@@ -1086,7 +1092,7 @@ void Frame::renderSprites(Archive &_movie, Graphics::ManagedSurface &surface, Co
 }
 
 void Frame::drawBackgndTransSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect) {
-	uint8 skipColor = 15; //FIXME is it always white (last entry in pallette) ?
+	uint8 skipColor = _vm->getPaletteColorCount() - 1; //FIXME is it always white (last entry in pallette) ?
 
 	for (int ii = 0; ii < sprite.h; ii++) {
 		const byte *src = (const byte *)sprite.getBasePtr(0, ii);
@@ -1102,6 +1108,39 @@ void Frame::drawBackgndTransSprite(Graphics::ManagedSurface &target, const Graph
 	}
 }
 
+void Frame::drawGhostSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect) {
+	uint8 skipColor = _vm->getPaletteColorCount() - 1;
+	for (int ii = 0; ii < sprite.h; ii++) {
+		const byte *src = (const byte *)sprite.getBasePtr(0, ii);
+		byte *dst = (byte *)target.getBasePtr(drawRect.left, drawRect.top + ii);
+
+		for (int j = 0; j < drawRect.width(); j++) {
+			if ((getSpriteIDFromPos(Common::Point(drawRect.left + j, drawRect.top + ii)) != 0) && (*src != skipColor))
+				*dst = (_vm->getPaletteColorCount() - 1) - *src; //Oposite color
+
+			src++;
+			dst++;
+		}
+	}
+}
+
+void Frame::drawReverseSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect) {
+	uint8 skipColor = _vm->getPaletteColorCount() - 1;
+	for (int ii = 0; ii < sprite.h; ii++) {
+		const byte *src = (const byte *)sprite.getBasePtr(0, ii);
+		byte *dst = (byte *)target.getBasePtr(drawRect.left, drawRect.top + ii);
+
+		for (int j = 0; j < drawRect.width(); j++) {
+			if ((getSpriteIDFromPos(Common::Point(drawRect.left + j, drawRect.top + ii)) != 0))
+				*dst = (_vm->getPaletteColorCount() - 1) - *src;
+			else if (*src != skipColor)
+				*dst = *src;
+			src++;
+			dst++;
+		}
+	}
+}
+
 void Frame::drawMatteSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect) {
 	//Like background trans, but all white pixels NOT ENCLOSED by coloured pixels are transparent
 	Graphics::Surface tmp;
diff --git a/engines/director/score.h b/engines/director/score.h
index 79eeae0961..a1d7281ae8 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -303,7 +303,8 @@ private:
 	void readMainChannels(Common::SeekableReadStream &stream, uint16 offset, uint16 size);
 	void drawBackgndTransSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect);
 	void drawMatteSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect);
-
+	void drawGhostSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect);
+	void drawReverseSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect);
 public:
 	uint8 _actionId;
 	uint8 _transDuration;