libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
_actionId was also read twice, the last one was the correct one.
Redefine the first _actionId as an unk.
This commit is contained in:
Roland van Laar 2020-07-21 22:42:18 +02:00
parent 2a310ee7e7
commit 5285e7d29c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/director/frame.cpp
View File

@ -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

4
engines/director/frame.h
View File

@ -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;