[Scummvm-git-logs] scummvm master -> 4a81475c2ce1acdff98a16000eba4142b42ffa77

rvanlaar roland at rolandvanlaar.nl
Sat Aug 14 21:30:59 UTC 2021


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:
4a81475c2c DIRECTOR: set editable for D4 TextCast


Commit: 4a81475c2ce1acdff98a16000eba4142b42ffa77
    https://github.com/scummvm/scummvm/commit/4a81475c2ce1acdff98a16000eba4142b42ffa77
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2021-08-14T23:30:45+02:00

Commit Message:
DIRECTOR: set editable for D4 TextCast

The field `_textFlags` in D4 casts flags the following values:
1: editable
2: auto tab
4: don't wrap

Improved debugprints

Changed paths:
    engines/director/castmember.cpp


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index 0ebdc1a6d1..97b49115ce 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -660,10 +660,18 @@ TextCastMember::TextCastMember(Cast *cast, uint16 castId, Common::SeekableReadSt
 		_initialRect = Movie::readRect(stream);
 		_maxHeight = stream.readUint16();
 		_textShadow = static_cast<SizeType>(stream.readByte());
-		_textFlags = stream.readByte();
+		_textFlags = stream.readByte(); // 1: editable, 2: auto tab 4: don't wrap
+		_editable = _textFlags & 0x1;
 
 		_textHeight = stream.readUint16();
 		_textSlant = 0;
+		debugC(2, kDebugLoading, "TextCastMember(): flags1: %d, border: %d gutter: %d shadow: %d textType: %d align: %04x",
+				_flags1, _borderSize, _gutterSize, _boxShadow, _textType, _textAlign);
+		debugC(2, kDebugLoading, "TextCastMember(): background rgb: 0x%04x 0x%04x 0x%04x, shadow: %d flags: %d textHeight: %d",
+				_bgpalinfo1, _bgpalinfo2, _bgpalinfo3, _textShadow, _textFlags, _textHeight);
+		if (debugChannelSet(2, kDebugLoading)) {
+			_initialRect.debugPrint(2, "TextCastMember(): rect:");
+		}
 	} else {
 		_fontId = 1;
 




More information about the Scummvm-git-logs mailing list