[Scummvm-git-logs] scummvm master -> 29ce91579d507db6fac7ac608f87da98f64a8ecc

[sev-]

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

Summary:
29ce91579d DIRECTOR: Fix shape cast member data size and byte order when saving


Commit: 29ce91579d507db6fac7ac608f87da98f64a8ecc
    https://github.com/scummvm/scummvm/commit/29ce91579d507db6fac7ac608f87da98f64a8ecc
Author: Gianluca Boiano (morf3089 at gmail.com)
Date: 2026-07-23T15:53:21+02:00

Commit Message:
DIRECTOR: Fix shape cast member data size and byte order when saving

The declared size missed the _flags1 byte the CASt wrapper writes for
D4, shapeType was hardcoded to rectangle, and _pattern was written
little-endian against a big-endian read.

Fixes 'Read past dataStream' reloading saved text_d4_win.dir (director-tests/saving)

Changed paths:
    engines/director/castmember/shape.cpp


diff --git a/engines/director/castmember/shape.cpp b/engines/director/castmember/shape.cpp
index 5b443c14dc4..c2ad578ee43 100644
--- a/engines/director/castmember/shape.cpp
+++ b/engines/director/castmember/shape.cpp
@@ -221,7 +221,9 @@ uint32 ShapeCastMember::getCastDataSize() {
 	// Total : 17 bytes
 	// For Director 4 : 1 byte extra for casttype (See Cast::loadCastData())
 	if (_cast->_version >= kFileVer400 && _cast->_version < kFileVer500) {
-		return 17 + 1;
+		// writeCAStResource() writes 1 byte for the cast type plus 1 for
+		// _flags1 when it isn't 0xFF
+		return 17 + 1 + (_flags1 != 0xFF ? 1 : 0);
 	} else if (_cast->_version >= kFileVer500 && _cast->_version < kFileVer1100) {
 		return 17;
 	} else {
@@ -231,11 +233,10 @@ uint32 ShapeCastMember::getCastDataSize() {
 }
 
 void ShapeCastMember::writeCastData(Common::SeekableWriteStream *writeStream) {
-	writeStream->writeByte(0);
-	writeStream->writeByte(1);
+	writeStream->writeUint16BE((uint16)_shapeType);
 
 	Movie::writeRect(writeStream, _initialRect);
-	writeStream->writeUint16LE(_pattern);
+	writeStream->writeUint16BE(_pattern);
 
 	// The foreground and background colors are transformed
 	// Need to retrieve the original colors for saving