[Scummvm-git-logs] scummvm master -> 7f0d69367b297b0e45ed131e299681a5cbcec7ee

[sev-]

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:
7f0d69367b DIRECTOR: Fix Palette loading wrong Palette index


Commit: 7f0d69367b297b0e45ed131e299681a5cbcec7ee
    https://github.com/scummvm/scummvm/commit/7f0d69367b297b0e45ed131e299681a5cbcec7ee
Author: Pragyansh Chaturvedi (r41k0u) (pragyanshchaturvedi18 at gmail.com)
Date: 2022-06-12T15:20:49+02:00

Commit Message:
DIRECTOR: Fix Palette loading wrong Palette index

Changed paths:
    engines/director/frame.cpp
    engines/director/score.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 13a904fac90..3ab1b48490b 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -167,9 +167,9 @@ void Frame::readChannels(Common::ReadStreamEndian *stream, uint16 version) {
 
 			stream->read(unk, 6);
 		} else {
-			stream->read(unk, 4);
+			stream->read(unk, 3);
 
-			_palette.paletteId = stream->readByte();
+			_palette.paletteId = stream->readUint16();
 			_palette.firstColor = stream->readByte(); // for cycles. note: these start at 0x80 (for pal entry 0)!
 			_palette.lastColor = stream->readByte();
 			_palette.flags = stream->readByte();
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index f315446588e..db921c688ae 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -256,7 +256,7 @@ void Score::startPlay() {
 	_playState = kPlayStarted;
 	_nextFrameTime = 0;
 
-	_lastPalette = _movie->getCast()->_defaultPalette;
+	_lastPalette = _frames[_currentFrame]->_palette.paletteId;
 	_vm->setPalette(resolvePaletteId(_lastPalette));
 
 	if (_frames.size() <= 1) {	// We added one empty sprite