thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Fixed freddy's Mac icon bar palettes

Browse source 
(hopefully for good now)
This commit is contained in:
Matthew Hoops 2011-02-21 20:32:30 -05:00
parent 4402153a09
commit 6db22dde64
1 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

34
engines/sci/graphics/palette.cpp
View file

@ -850,21 +850,16 @@ void GfxPalette::palVaryProcess(int signal, bool setPalette) {
byte GfxPalette::findMacIconBarColor(byte r, byte g, byte b) { byte GfxPalette::findMacIconBarColor(byte r, byte g, byte b) {
// Find the best color for use with the Mac icon bar // Find the best color for use with the Mac icon bar
// For black, always use 0
if (r == 0 && g == 0 && b == 0)
return 0;
byte found = 0xFF; byte found = 0xFF;
uint diff = 0xFFFFFFFF; uint diff = 0xFFFFFFFF;
for (uint16 i = 1; i < 255; i++) { for (uint16 i = 0; i < 256; i++) {
int dr = _macClut[i * 3 ] - r; // Use the difference of the top 4 bits
int dg = _macClut[i * 3 + 1] - g; int dr = (_macClut[i * 3 ] & 0xf0) - (r & 0xf0);
int db = _macClut[i * 3 + 2] - b; int dg = (_macClut[i * 3 + 1] & 0xf0) - (g & 0xf0);
int db = (_macClut[i * 3 + 2] & 0xf0) - (b & 0xf0);
// Use the largest difference. This is what the Mac Palette Manager does. uint cdiff = ABS(dr) + ABS(dg) + ABS(db);
uint cdiff = MAX<int>(ABS(dr), ABS(dg));
cdiff = MAX<int>(cdiff, ABS(db));
if (cdiff == 0) if (cdiff == 0)
return i; return i;
@ -889,7 +884,9 @@ void GfxPalette::loadMacIconBarPalette() {
clutStream->readUint32BE(); // seed clutStream->readUint32BE(); // seed
clutStream->readUint16BE(); // flags clutStream->readUint16BE(); // flags
uint16 colorCount = clutStream->readUint16BE() + 1; uint16 colorCount = clutStream->readUint16BE() + 1;
_macClut = new byte[colorCount * 3]; assert(colorCount == 256);
_macClut = new byte[256 * 3];
for (uint16 i = 0; i < colorCount; i++) { for (uint16 i = 0; i < colorCount; i++) {
clutStream->readUint16BE(); clutStream->readUint16BE();
@ -898,6 +895,19 @@ void GfxPalette::loadMacIconBarPalette() {
_macClut[i * 3 + 2] = clutStream->readUint16BE() >> 8; _macClut[i * 3 + 2] = clutStream->readUint16BE() >> 8;
} }
// Adjust bounds on the KQ6 palette
// We don't use all of it for the icon bar
if (g_sci->getGameId() == GID_KQ6)
memset(_macClut + 32 * 3, 0, (256 - 32) * 3);
// Force black/white
_macClut[0x00 * 3 ] = 0;
_macClut[0x00 * 3 + 1] = 0;
_macClut[0x00 * 3 + 2] = 0;
_macClut[0xff * 3 ] = 0xff;
_macClut[0xff * 3 + 1] = 0xff;
_macClut[0xff * 3 + 2] = 0xff;
delete clutStream; delete clutStream;
} }