[Scummvm-git-logs] scummvm master -> 5285e7d29cdfb5debe90033da54fec325ddc892b

[rvanlaar]

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:
5285e7d29c DIRECTOR: make _actionId a uint16, it can be > 255


Commit: 5285e7d29cdfb5debe90033da54fec325ddc892b
    https://github.com/scummvm/scummvm/commit/5285e7d29cdfb5debe90033da54fec325ddc892b
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2020-07-21T22:48:27+02:00

Commit Message:
DIRECTOR: make _actionId a uint16, it can be > 255

_actionId was also read twice, the last one was the correct one.
Redefine the first _actionId as an unk.

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


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index d7181d6e9d..58c308ff69 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -185,7 +185,7 @@ void Frame::readChannels(Common::ReadStreamEndian *stream) {
 			stream->read(unk, 3);
 	} else if (_vm->getVersion() == 4) {
 		// Sound/Tempo/Transition
-		_actionId = stream->readByte();
+		int unk1 = stream->readByte();
 		_soundType1 = stream->readByte(); // type: 0x17 for sounds (sound is cast id), 0x16 for MIDI (sound is cmd id)
 		uint8 transFlags = stream->readByte(); // 0x80 is whole stage (vs changed area), rest is duration in 1/4ths of a second
 
diff --git a/engines/director/frame.h b/engines/director/frame.h
index 85412b6e72..9a3008a66e 100644
--- a/engines/director/frame.h
+++ b/engines/director/frame.h
@@ -83,11 +83,11 @@ private:
 	Image::ImageDecoder *getImageFrom(uint16 spriteId);
 	Common::String readTextStream(Common::SeekableSubReadStreamEndian *textStream, TextCastMember *textCast);
 
-
+	
 public:
 	int _numChannels;
 	byte _channelData[kChannelDataSize];
-	uint8 _actionId;
+	uint16 _actionId;
 	uint16 _transDuration;
 	uint8 _transArea; // 1 - Whole Stage, 0 - Changing Area
 	uint8 _transChunkSize;