[Scummvm-git-logs] scummvm master -> 298369fcba4c006828c94847dd726608fe3b8357

[rvanlaar]

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

Summary:
b2fe4cedea DIRECTOR: Improve output of BUILDBOT EOS message
5191eb18ab DIRECTOR: Hexdump text castmember on debug loading
298369fcba DIRECTOR: Load D5 text and button castmembers


Commit: b2fe4cedea9121a551babf581a5b40a4f44d0adf
    https://github.com/scummvm/scummvm/commit/b2fe4cedea9121a551babf581a5b40a4f44d0adf
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2024-09-06T16:33:13+02:00

Commit Message:
DIRECTOR: Improve output of BUILDBOT EOS message

Add the castType to the output of the End Of Stream BUILDBOT message.

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index fcf4b7e14ed..d949a61bb15 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -1096,7 +1096,7 @@ void Cast::loadCastData(Common::SeekableReadStreamEndian &stream, uint16 id, Res
 		break;
 	}
 	if (castStream.eos()) {
-		warning("BUILDBOT: Read past dataStream for id: %d", id);
+		warning("BUILDBOT: Read past dataStream for id: %d type: %s", id, castType2str((CastType) castType));
 	}
 
 	if (_loadedCast->contains(id)) { // Skip unhandled casts


Commit: 5191eb18ab159c931e977ffa386645c7bb9e8514
    https://github.com/scummvm/scummvm/commit/5191eb18ab159c931e977ffa386645c7bb9e8514
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2024-09-06T17:52:09+02:00

Commit Message:
DIRECTOR: Hexdump text castmember on debug loading

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


diff --git a/engines/director/castmember/text.cpp b/engines/director/castmember/text.cpp
index 87b042e524e..b7e86380cb1 100644
--- a/engines/director/castmember/text.cpp
+++ b/engines/director/castmember/text.cpp
@@ -64,6 +64,10 @@ TextCastMember::TextCastMember(Cast *cast, uint16 castId, Common::SeekableReadSt
 	// seems like the line spacing is default to 1 in D4
 	_lineSpacing = g_director->getVersion() >= 400 ? 1 : 0;
 
+	if (debugChannelSet(4, kDebugLoading)) {
+		stream.hexdump(stream.size());
+	}
+
 	if (version < kFileVer400) {
 		_flags1 = flags1; // region: 0 - auto, 1 - matte, 2 - disabled
 		_borderSize = static_cast<SizeType>(stream.readByte());


Commit: 298369fcba4c006828c94847dd726608fe3b8357
    https://github.com/scummvm/scummvm/commit/298369fcba4c006828c94847dd726608fe3b8357
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2024-09-06T18:02:35+02:00

Commit Message:
DIRECTOR: Load D5 text and button castmembers

Removed specific loading code for text/button castmembers > D4.
Loading D5 text and button castmembers in the same way as D4 does
just works.

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


diff --git a/engines/director/castmember/text.cpp b/engines/director/castmember/text.cpp
index b7e86380cb1..f1e396c10db 100644
--- a/engines/director/castmember/text.cpp
+++ b/engines/director/castmember/text.cpp
@@ -115,7 +115,7 @@ TextCastMember::TextCastMember(Cast *cast, uint16 castId, Common::SeekableReadSt
 		if (debugChannelSet(2, kDebugLoading)) {
 			_initialRect.debugPrint(2, "TextCastMember(): rect:");
 		}
-	} else if (version >= kFileVer400 && version < kFileVer500) {
+	} else if (version >= kFileVer400 && version < kFileVer600) {
 		_flags1 = flags1;
 		_borderSize = static_cast<SizeType>(stream.readByte());
 		_gutterSize = static_cast<SizeType>(stream.readByte());
@@ -145,29 +145,7 @@ TextCastMember::TextCastMember(Cast *cast, uint16 castId, Common::SeekableReadSt
 			_initialRect.debugPrint(2, "TextCastMember(): rect:");
 		}
 	} else {
-		_fontId = 1;
-
-		stream.readUint32();
-		stream.readUint32();
-		stream.readUint32();
-		stream.readUint32();
-		uint16 skip = stream.readUint16();
-		for (int i = 0; i < skip; i++)
-			stream.readUint32();
-
-		stream.readUint32();
-		stream.readUint32();
-		stream.readUint32();
-		stream.readUint32();
-		stream.readUint32();
-		stream.readUint32();
-
-		_initialRect = Movie::readRect(stream);
-		_boundingRect = Movie::readRect(stream);
-
-		stream.readUint32();
-		stream.readUint16();
-		stream.readUint16();
+		warning("Text/ButtonCastMember(): >D5 isn't handled");
 	}
 
 	if (asButton) {