libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-03 07:59:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: fix full view remap effect (#1432)

Browse Source
This commit is contained in:
Kawa 2018-12-03 21:31:23 +01:00 committed by Filippos Karapetis
parent 40ff3048f4
commit c22e8ebfd0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/sci/graphics/animate.cpp
View File

@ -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)

8
engines/sci/graphics/view.cpp
View File

@ -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);
}