Skip to content
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.

Sign up for GitHub

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

Jump to bottom

SCUMM: Fix Windows cursor mask regression. #4872

Merged
merged 1 commit into from
Apr 4, 2023
Merged

SCUMM: Fix Windows cursor mask regression. #4872

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion engines/scumm/he/resource_he.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,12 @@ bool Win32ResExtractor::extractResource(int id, CachedCursor *cc) {

// Convert from the paletted format to the SCUMM palette
const byte *srcBitmap = cursor->getSurface();
const byte *srcMask = cursor->getMask();

for (int i = 0; i < cursor->getWidth() * cursor->getHeight(); i++) {
if (srcBitmap[i] == cursor->getKeyColor()) // Transparent
const bool isTransparent = (srcMask ? (srcMask[i] != kCursorMaskOpaque) : (srcBitmap[i] == cursor->getKeyColor()));

if (isTransparent)
cc->bitmap[i] = 255;
else if (srcBitmap[i] == 0) // Black
cc->bitmap[i] = 253;
Expand Down