From df3d87062e25b208d62564c27f2d3610abc7325b Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Wed, 25 Dec 2019 18:05:05 +0100
Subject: DIRECTOR: Temporarily revert the ink selection for QuickDraw shapes

---
 engines/director/frame.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines/director/frame.cpp')

diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index f93a6610ce..e9f189fcf4 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -661,7 +661,7 @@ void Frame::renderShape(Graphics::ManagedSurface &surface, uint16 spriteId) {
 	if (sp->_shapeCast != NULL) {
 		sp->_foreColor = sp->_shapeCast->_fgCol;
 		sp->_backColor = sp->_shapeCast->_bgCol;
-		sp->_ink = sp->_shapeCast->_ink;
+		//sp->_ink = sp->_shapeCast->_ink;
 	}
 
 	Common::Rect shapeRect = Common::Rect(sp->_startPoint.x,
@@ -674,7 +674,7 @@ void Frame::renderShape(Graphics::ManagedSurface &surface, uint16 spriteId) {
 
 	// No minus one on the pattern here! MacPlotData will do that for us!
 	//Graphics::MacPlotData pd(&tmpSurface, &_vm->getPatterns(), 1, 1, sp->_backColor);
-	Graphics::MacPlotData pd(&tmpSurface, &_vm->getPatterns(), sp->_ink + 1, sp->_lineSize + 1, sp->_backColor);
+	Graphics::MacPlotData pd(&tmpSurface, &_vm->getPatterns(), sp->_castId, sp->_lineSize + 1, sp->_backColor);
 	Common::Rect fillRect(shapeRect.width(), shapeRect.height());
 
 	switch (sp->_spriteType) {
@@ -694,7 +694,8 @@ void Frame::renderShape(Graphics::ManagedSurface &surface, uint16 spriteId) {
 		Graphics::drawLine(fillRect.left, fillRect.bottom, fillRect.right, fillRect.top, sp->_foreColor, Graphics::macDrawPixel, &pd);
 		break;
 	case kOutlinedRectangleSprite:	// this is actually a mouse-over shape? I don't think it's a real button.
-		Graphics::drawRect(fillRect, sp->_foreColor, Graphics::macDrawPixel, &pd);
+		//Graphics::drawRect(fillRect, sp->_foreColor, Graphics::macDrawPixel, &pd);
+		tmpSurface.fillRect(Common::Rect(shapeRect.width(), shapeRect.height()), (_vm->getCurrentScore()->_currentMouseDownSpriteId == spriteId ? 0 : 0xff));
 		break;
 	case kOutlinedRoundedRectangleSprite:
 		Graphics::drawRoundRect(fillRect, 4, sp->_foreColor, false, Graphics::macDrawPixel, &pd);
-- 
cgit v1.2.3