From c22e8ebfd026489ce53daae979c258ea5eb3edea Mon Sep 17 00:00:00 2001
From: Kawa
Date: Mon, 3 Dec 2018 21:31:23 +0100
Subject: SCI: fix full view remap effect (#1432)

---
 engines/sci/graphics/animate.cpp | 2 +-
 engines/sci/graphics/view.cpp    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/sci')

diff --git a/engines/sci/graphics/animate.cpp b/engines/sci/graphics/animate.cpp
index 8875162394..3e3a0814aa 100644
--- a/engines/sci/graphics/animate.cpp
+++ b/engines/sci/graphics/animate.cpp
@@ -474,7 +474,7 @@ void GfxAnimate::drawCels() {
 			writeSelector(_s->_segMan, it->object, SELECTOR(underBits), bitsHandle);
 
 			// draw corresponding cel
-			_paint16->drawCel(it->viewId, it->loopNo, it->celNo, it->celRect, it->priority, it->paletteNo, it->scaleX, it->scaleY);
+			_paint16->drawCel(it->viewId, it->loopNo, it->celNo, it->celRect, it->priority, it->paletteNo, it->scaleX, it->scaleY, it->scaleSignal);
 			it->showBitsFlag = true;
 
 			if (it->signal & kSignalRemoveView)
diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp
index 9ed08cee1b..014ddb1281 100644
--- a/engines/sci/graphics/view.cpp
+++ b/engines/sci/graphics/view.cpp
@@ -832,8 +832,8 @@ void GfxView::draw(const Common::Rect &rect, const Common::Rect &clipRect, const
 						// SCI16 remapping (QFG4 demo)
 						if (g_sci->_gfxRemap16 && g_sci->_gfxRemap16->isRemapped(outputColor))
 							outputColor = g_sci->_gfxRemap16->remapColor(outputColor, _screen->getVisual(x2, y2));
-						// SCI16+ remapping (Catdate)
-						if ((scaleSignal & 0x200) && g_sci->_gfxRemap16 && !g_sci->_gfxRemap16->isRemapped(outputColor))
+						// SCI11+ remapping (Catdate)
+						if ((scaleSignal & 0x200) && g_sci->_gfxRemap16)
 							outputColor = g_sci->_gfxRemap16->remapColor(253, outputColor);
 						_screen->putPixel(x2, y2, drawMask, outputColor, priority, 0);
 					}
@@ -926,8 +926,8 @@ void GfxView::drawScaled(const Common::Rect &rect, const Common::Rect &clipRect,
 				// SCI16 remapping (QFG4 demo)
 				if (g_sci->_gfxRemap16 && g_sci->_gfxRemap16->isRemapped(outputColor))
 					outputColor = g_sci->_gfxRemap16->remapColor(outputColor, _screen->getVisual(x2, y2));
-				// SCI16+ remapping (Catdate)
-				if ((scaleSignal & 0x200) && g_sci->_gfxRemap16 && !g_sci->_gfxRemap16->isRemapped(outputColor))
+				// SCI11+ remapping (Catdate)
+				if ((scaleSignal & 0x200) && g_sci->_gfxRemap16)
 					outputColor = g_sci->_gfxRemap16->remapColor(253, outputColor);
 				_screen->putPixel(x2, y2, drawMask, outputColor, priority, 0);
 			}
-- 
cgit v1.2.3