Permalink
Browse files

SCI: fix full view remap effect (#1432)

  • Loading branch information...
Kawa-oneechan authored and bluegr committed Dec 3, 2018
1 parent 40ff304 commit c22e8ebfd026489ce53daae979c258ea5eb3edea
Showing with 5 additions and 5 deletions.
  1. +1 −1 engines/sci/graphics/animate.cpp
  2. +4 −4 engines/sci/graphics/view.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)
@@ -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);
}

0 comments on commit c22e8eb

Please sign in to comment.