libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: Fix MacCursor handling of color 255

Browse Source 
Fixes bug #13922 where black cursor pixels in the SCI game QFG1VGA-Mac
weren't being drawn. MacCursor uses 255 as its color key but in CRSR
resources 255 is defined as black. CRSR resources use a mask for
transparency so they have no color key. Now 255 is remapped to black.
This commit is contained in:
sluicebox 2022-11-09 03:54:15 -08:00
parent a495372361
commit e3c179e975
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
graphics/maccursor.cpp
View File

@ -162,6 +162,18 @@ bool MacCursor::readFromCRSR(Common::SeekableReadStream &stream, bool forceMonoc
_palette[c * 3 + 2] = stream.readUint16BE() >> 8;
}
// Find black so that Macintosh black (255) can be remapped.
// This is necessary because we use 255 for the color key.
byte black = 0;
for (byte c = 0; c < 255; c++) {
if (_palette[c * 3 + 0] == 0 &&
_palette[c * 3 + 1] == 0 &&
_palette[c * 3 + 2] == 0) {
black = c;
break;
}
}
int pixelsPerByte = (iconBounds[2] - iconBounds[0]) / iconRowBytes;
int bpp = 8 / pixelsPerByte;
@ -177,8 +189,13 @@ bool MacCursor::readFromCRSR(Common::SeekableReadStream &stream, bool forceMonoc
for (int b = 0; b < pixelsPerByte; b++) {
int idx = j * pixelsPerByte + (pixelsPerByte - 1 - b);
if (_surface[idx] != 0xff) // if mask is not there
if (_surface[idx] != 0xff) { // if mask is not there
_surface[idx] = (byte)((iconData[j] >> (b * bpp)) & bitmask);
// Remap Macintosh black
if (_surface[idx] == 255) {
_surface[idx] = black;
}
}
}
}