New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SCI: fix full view remap effect #1432

Merged
merged 1 commit into from Dec 3, 2018

Conversation

Projects
None yet
2 participants
@Kawa-oneechan
Contributor

Kawa-oneechan commented Dec 3, 2018

The new stuff added to view.cpp for SCI11+ never actually triggers because I'd neglected to have GfxAnimate::drawCels() pass the scaleSignal that the remap effect requires, thus defaulting to zero.

This has been tested and correctly lets the work-in-progress full version of The Dating Pool draw characters standing in shadow.

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

This comment has been minimized.

@Kawa-oneechan

Kawa-oneechan Dec 3, 2018

Contributor

I guess bluegr and I both missed these two comments.

// SCI16+ remapping (Catdate)
if ((scaleSignal & 0x200) && g_sci->_gfxRemap16 && !g_sci->_gfxRemap16->isRemapped(outputColor))
// SCI11+ remapping (Catdate)
if ((scaleSignal & 0x200) && g_sci->_gfxRemap16)

This comment has been minimized.

@Kawa-oneechan

Kawa-oneechan Dec 3, 2018

Contributor

Anything under 253 is of course never set to be remapped.

@bluegr

bluegr approved these changes Dec 3, 2018

@bluegr

This comment has been minimized.

Member

bluegr commented Dec 3, 2018

Thanks, merging

@bluegr bluegr merged commit c22e8eb into scummvm:master Dec 3, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@Kawa-oneechan

This comment has been minimized.

Contributor

Kawa-oneechan commented Dec 3, 2018

Jeez that went fast. I expected it go faster this time but woah!

And I missed it by an hour again 😁

@Kawa-oneechan Kawa-oneechan deleted the Kawa-oneechan:dating-pool branch Dec 3, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment