[Scummvm-git-logs] scummvm master -> d59292f9fdfdc71e852f0e483a70fd93d29851f1

[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:
d59292f9fd DIRECTOR: More text cast loading


Commit: d59292f9fdfdc71e852f0e483a70fd93d29851f1
    https://github.com/scummvm/scummvm/commit/d59292f9fdfdc71e852f0e483a70fd93d29851f1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-16T17:55:34+02:00

Commit Message:
DIRECTOR: More text cast loading

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


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index bafa8b8339..46a475d398 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -298,13 +298,15 @@ TextCastMember::TextCastMember(Cast *cast, uint16 castId, Common::ReadStreamEndi
 	_gutterSize = kSizeNone;
 	_boxShadow = kSizeNone;
 	_buttonType = kTypeButton;
+	_maxHeight = _textHeight = 0;
 
 	_bgcolor = 0;
 	_fgcolor = 0;
 
 	_flags = 0;
 	_textFlags = 0;
-	_fontId = 0;
+	_scroll = 0;
+	_fontId = 1;
 	_fontSize = 12;
 	_textType = kTextTypeFixed;
 	_textAlign = kTextAlignLeft;
@@ -369,23 +371,22 @@ TextCastMember::TextCastMember(Cast *cast, uint16 castId, Common::ReadStreamEndi
 		_bgpalinfo1 = stream.readUint16();
 		_bgpalinfo2 = stream.readUint16();
 		_bgpalinfo3 = stream.readUint16();
-		stream.readUint16();
+		_scroll = stream.readUint16();
 
 		_fontId = 1; // this is in STXT
 
 		_initialRect = Movie::readRect(stream);
-		stream.readUint16();
+		_maxHeight = stream.readUint16();
 		_textShadow = static_cast<SizeType>(stream.readByte());
-		byte flags2 = stream.readByte();
+		_textFlags = stream.readByte();
 
-		if (flags || flags2)
-			warning("BUILDBOT: Unprocessed text cast flags: %x, flags:2 %x", flags, flags2);
+		if (flags)
+			warning("BUILDBOT: Unprocessed text cast flags: %x", flags);
 
-		_fontSize = stream.readUint16();
+		_textHeight = stream.readUint16();
 		_textSlant = 0;
 	} else {
 		_fontId = 1;
-		_fontSize = 12;
 
 		stream.readUint32();
 		stream.readUint32();
diff --git a/engines/director/castmember.h b/engines/director/castmember.h
index 3d970c24ca..4af317fe84 100644
--- a/engines/director/castmember.h
+++ b/engines/director/castmember.h
@@ -174,6 +174,8 @@ public:
 	SizeType _borderSize;
 	SizeType _gutterSize;
 	SizeType _boxShadow;
+	uint16 _maxHeight;
+	uint16 _textHeight;
 
 	byte _flags;
 	uint32 _fontId;
@@ -181,6 +183,7 @@ public:
 	TextType _textType;
 	TextAlignType _textAlign;
 	SizeType _textShadow;
+	uint16 _scroll;
 	byte _textSlant;
 	byte _textFlags;
 	uint16 _bgpalinfo1, _bgpalinfo2, _bgpalinfo3;