libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: When merging palettes, map all unused colours to index 0.

Browse Source 
This fixes the boots/belt of the hero sprite in QfG3 character generation.

svn-id: r44448
This commit is contained in:
Willem Jan Palenstijn 2009-09-28 19:39:17 +00:00
parent ccc737a714
commit f413356bed
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/sci/gfx/palette.cpp
View File

@ -108,8 +108,9 @@ void Palette::unmerge() {
int count = 0;
for (uint i = 0; i < _size; ++i) {
if (_colors[i].refcount == PALENTRY_FREE)
continue;
if (_colors[i].refcount == PALENTRY_FREE) {
assert(_colors[i].parent_index == 0);
}
int pi = _colors[i].parent_index;
assert(pi >= 0);
@ -243,8 +244,15 @@ bool Palette::mergeInto(Palette *parent) {
for (uint i = 0; i < _size; ++i) {
PaletteEntry& entry = _colors[i];
if (entry.refcount == PALENTRY_FREE)
if (entry.refcount == PALENTRY_FREE) {
// Force all unused colours to index 0
entry.parent_index = 0;
if (_parent->_colors[0].refcount != PALENTRY_LOCKED)
_parent->_colors[0].refcount++;
if (_colors[i].r || _colors[i].g || _colors[i].b)
warning("Non-black unused colour in pic: index %d, %02X %02X %02X", i, _colors[i].r, _colors[i].g, _colors[i].b);
continue;
}
uint pi = _parent->findNearbyColor(entry.r, entry.g, entry.b);
#ifdef DEBUG_MERGE