[Scummvm-git-logs] scummvm master -> 76a71a004707affcec8b0c853d65c69cbafd6e6f

[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:
76a71a0047 DIRECTOR: Simplify filmloop/movie castmember loading


Commit: 76a71a004707affcec8b0c853d65c69cbafd6e6f
    https://github.com/scummvm/scummvm/commit/76a71a004707affcec8b0c853d65c69cbafd6e6f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-03-07T01:34:48+01:00

Commit Message:
DIRECTOR: Simplify filmloop/movie castmember loading

Changed paths:
    engines/director/castmember/filmloop.cpp
    engines/director/castmember/movie.cpp


diff --git a/engines/director/castmember/filmloop.cpp b/engines/director/castmember/filmloop.cpp
index f9e58af2c82..a2d8eaed9dd 100644
--- a/engines/director/castmember/filmloop.cpp
+++ b/engines/director/castmember/filmloop.cpp
@@ -48,15 +48,9 @@ FilmLoopCastMember::FilmLoopCastMember(Cast *cast, uint16 castId, Common::Seekab
 
 	if (cast->_version >= kFileVer400) {
 		_initialRect = Movie::readRect(stream);
-		uint8 unk1 = stream.readByte();
-		uint8 unk2 = stream.readByte();
-		uint8 unk3 = stream.readByte();
-		uint8 flags = stream.readByte();
-		uint8 unk4 = stream.readByte();
-		uint8 unk5 = stream.readByte();
-		debugC(5, kDebugLoading, "FilmLoopCastMember::FilmLoopCastMember(): unk1: %d, unk2: %d, unk3: %d, flags: %d, unk4: %d, unk5: %d",
-			unk1, unk2, unk3, flags, unk4, unk5
-		);
+		uint32 flags = stream.readUint32BE();
+		uint16 unk1 = stream.readUint16BE();
+		debugC(5, kDebugLoading, "FilmLoopCastMember::FilmLoopCastMember(): flags: %d, unk1: %d", flags, unk1);
 		_looping = flags & 64 ? 0 : 1;
 		_enableSound = flags & 8 ? 1 : 0;
 		_crop = flags & 2 ? 0 : 1;
diff --git a/engines/director/castmember/movie.cpp b/engines/director/castmember/movie.cpp
index 2d4ad24d79e..44a7068c4e8 100644
--- a/engines/director/castmember/movie.cpp
+++ b/engines/director/castmember/movie.cpp
@@ -31,7 +31,7 @@ MovieCastMember::MovieCastMember(Cast *cast, uint16 castId, Common::SeekableRead
 	_type = kCastMovie;
 
 	_initialRect = Movie::readRect(stream);
-	_flags = stream.readUint32();
+	_flags = stream.readUint32BE();
 
 	_looping = !(_flags & 0x20);
 	_enableScripts = _flags & 0x10;