From ec306cf4b3b9c8ee044e64bc4b4fbe2db348893f Mon Sep 17 00:00:00 2001 From: Roland van Laar Date: Sun, 22 Mar 2020 22:10:27 +0100 Subject: [PATCH] DIRECTOR: make implicit transformColor explicit Color ids from director shapes and sprites need to be reversed to be displayed correctly. The ids are stored as signed ints. The original conversion to signed ints also reversed the ids: i.e. -128 .. 127 was transformed to 255 .. 0. This commit converts the colors to signed ints, the reversing itself is handled by the DirectorEngine::transformColor function. --- engines/director/cast.cpp | 5 +++-- engines/director/frame.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp index 4c4cb8e4b6b..16884117f54 100644 --- a/engines/director/cast.cpp +++ b/engines/director/cast.cpp @@ -298,8 +298,9 @@ ShapeCast::ShapeCast(Common::ReadStreamEndian &stream, uint16 version) { _shapeType = static_cast(stream.readByte()); _initialRect = Score::readRect(stream); _pattern = stream.readUint16BE(); - _fgCol = (127 - stream.readByte()) & 0xff; // -128 ... 127 -> 255 ... 0 - _bgCol = (127 - stream.readByte()) & 0xff; + // Normalize D2 and D3 colors from -128 ... 127 to 0 ... 255. + _fgCol = g_director->transformColor((128 + stream.readByte()) & 0xff); + _bgCol = g_director->transformColor((128 + stream.readByte()) & 0xff); _fillType = stream.readByte(); _ink = static_cast(_fillType & 0x3f); _lineThickness = stream.readByte(); diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp index c9b0556f1f2..ec8d5fbf4e7 100644 --- a/engines/director/frame.cpp +++ b/engines/director/frame.cpp @@ -205,8 +205,9 @@ void Frame::readChannels(Common::ReadStreamEndian *stream) { sprite._foreColor = _vm->transformColor((uint8)stream->readByte()); sprite._backColor = _vm->transformColor((uint8)stream->readByte()); } else { - sprite._foreColor = (127 - stream->readByte()) & 0xff; // -128 ... 127 -> 255 ... 0 - sprite._backColor = (127 - stream->readByte()) & 0xff; + // Normalize D2 and D3 colors from -128 ... 127 to 0 ... 255. + sprite._foreColor = _vm->transformColor((128 + stream->readByte()) & 0xff); + sprite._backColor = _vm->transformColor((128 + stream->readByte()) & 0xff); } sprite._flags = stream->readUint16();