diff options
author | Martin Kiewitz | 2014-10-28 01:40:40 +0100 |
---|---|---|
committer | Martin Kiewitz | 2014-10-28 01:40:40 +0100 |
commit | f317e8c8777bdc8482b5e55f3f28873a61eab7da (patch) | |
tree | 5a1a0223d566e824c59b5640cc6c55e2c49469a9 /engines/sci | |
parent | da9ffe9dbc0912463c6161186085525bb775c0c1 (diff) | |
download | scummvm-rg350-f317e8c8777bdc8482b5e55f3f28873a61eab7da.tar.gz scummvm-rg350-f317e8c8777bdc8482b5e55f3f28873a61eab7da.tar.bz2 scummvm-rg350-f317e8c8777bdc8482b5e55f3f28873a61eab7da.zip |
SCI: implement 8-bit color matching SCI1.1 bug
effectively fixes bug #6455
thanks to wjp and [md5]
Diffstat (limited to 'engines/sci')
-rw-r--r-- | engines/sci/console.cpp | 1 | ||||
-rw-r--r-- | engines/sci/graphics/palette.cpp | 28 | ||||
-rw-r--r-- | engines/sci/graphics/palette.h | 2 |
3 files changed, 24 insertions, 7 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 565e9752c3..510c8cd9ca 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -485,6 +485,7 @@ bool Console::cmdGetVersion(int argc, const char **argv) { #endif debugPrintf("View type: %s\n", viewTypeDesc[g_sci->getResMan()->getViewType()]); debugPrintf("Uses palette merging: %s\n", g_sci->_gfxPalette->isMerging() ? "yes" : "no"); + debugPrintf("Uses 16 bit color matching: %s\n", g_sci->_gfxPalette->isUsing16bitColorMatch() ? "yes" : "no"); debugPrintf("Resource volume version: %s\n", g_sci->getResMan()->getVolVersionDesc()); debugPrintf("Resource map version: %s\n", g_sci->getResMan()->getMapVersionDesc()); debugPrintf("Contains selector vocabulary (vocab.997): %s\n", hasVocab997 ? "yes" : "no"); diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp index c98d1d8e8d..36b9660d4e 100644 --- a/engines/sci/graphics/palette.cpp +++ b/engines/sci/graphics/palette.cpp @@ -65,14 +65,19 @@ GfxPalette::GfxPalette(ResourceManager *resMan, GfxScreen *screen) // the real merging done in earlier games. If we use the copying over, we // will get issues because some views have marked all colors as being used // and those will overwrite the current palette in that case - if (getSciVersion() < SCI_VERSION_1_1) + if (getSciVersion() < SCI_VERSION_1_1) { _useMerging = true; - else if (getSciVersion() == SCI_VERSION_1_1) + _use16bitColorMatch = true; + } else if (getSciVersion() == SCI_VERSION_1_1) { // there are some games that use inbetween SCI1.1 interpreter, so we have // to detect if the current game is merging or copying _useMerging = _resMan->detectPaletteMergingSci11(); - else // SCI32 + _use16bitColorMatch = _useMerging; + } else { + // SCI32 _useMerging = false; + _use16bitColorMatch = false; // not verified that SCI32 uses 8-bit color matching + } palVaryInit(); @@ -120,6 +125,10 @@ bool GfxPalette::isMerging() { return _useMerging; } +bool GfxPalette::isUsing16bitColorMatch() { + return _use16bitColorMatch; +} + // meant to get called only once during init of engine void GfxPalette::setDefault() { if (_resMan->getViewType() == kViewEga) @@ -520,14 +529,19 @@ uint16 GfxPalette::matchColor(byte r, byte g, byte b) { dr = _sysPalette.colors[i].r - r; dg = _sysPalette.colors[i].g - g; db = _sysPalette.colors[i].b - b; + if (!_use16bitColorMatch) { + // remove upper bits for most SCI1.1 games + // this bug was introduced with Quest For Glory 3 interpreter + // we have to implement it, otherwise some colors will be "wrong" + // See Space Quest 5 bug #6455 + dr &= 0xFF; + dg &= 0xFF; + db &= 0xFF; + } // minimum squares match cdiff = (dr*dr) + (dg*dg) + (db*db); // minimum sum match (Sierra's) // cdiff = ABS(dr) + ABS(dg) + ABS(db); -// Note: (most? all?) SCI 1.1 interpreters have a bug in this code, -// and in fact have dr, dg, db as signed int8. This makes the comparison -// wrap around so that 0 and 255 have an effective distance of 1. -// See bug 6455 for a symptom of this in SQ5. if (cdiff < diff) { if (cdiff == 0) return i | 0x8000; // setting this flag to indicate exact match diff --git a/engines/sci/graphics/palette.h b/engines/sci/graphics/palette.h index 347695deb8..93cc2a8189 100644 --- a/engines/sci/graphics/palette.h +++ b/engines/sci/graphics/palette.h @@ -46,6 +46,7 @@ public: ~GfxPalette(); bool isMerging(); + bool isUsing16bitColorMatch(); void setDefault(); void createFromData(byte *data, int bytesLeft, Palette *paletteOut); @@ -124,6 +125,7 @@ private: bool _sysPaletteChanged; bool _useMerging; + bool _use16bitColorMatch; Common::Array<PalSchedule> _schedules; |