[Scummvm-git-logs] scummvm master -> 6f78d0e47e2300f4a1a9b0e0a81de1846ed9950b

sev- noreply at scummvm.org
Thu Jun 23 09:35:53 UTC 2022


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6f78d0e47e DIRECTOR: fix palette regression


Commit: 6f78d0e47e2300f4a1a9b0e0a81de1846ed9950b
    https://github.com/scummvm/scummvm/commit/6f78d0e47e2300f4a1a9b0e0a81de1846ed9950b
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2022-06-23T11:35:50+02:00

Commit Message:
DIRECTOR: fix palette regression

7f0d69367b297b0e45ed131e299681a5cbcec7ee introduced a fix for
fetching the palette. However, it misinterpreted the number as an
unsigned int instead of a signed int, leading to incorrect palettes
on certain other games.

Changed paths:
    engines/director/frame.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 3ab1b48490b..ca7055e6e9f 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -169,7 +169,7 @@ void Frame::readChannels(Common::ReadStreamEndian *stream, uint16 version) {
 		} else {
 			stream->read(unk, 3);
 
-			_palette.paletteId = stream->readUint16();
+			_palette.paletteId = stream->readSint16();
 			_palette.firstColor = stream->readByte(); // for cycles. note: these start at 0x80 (for pal entry 0)!
 			_palette.lastColor = stream->readByte();
 			_palette.flags = stream->readByte();




More information about the Scummvm-git-logs mailing list