aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2016-08-25 18:01:22 +0200
committerEugene Sandulenko2016-08-25 18:16:15 +0200
commit6e8e0845a16fbe54dffca84d86cc187b0b429557 (patch)
treefd58b44cff9f3cc155085db5ed99ad092edcd24a
parent7e0899f5d4d3876da5aa9a6b724c16e2e08f257b (diff)
downloadscummvm-rg350-6e8e0845a16fbe54dffca84d86cc187b0b429557.tar.gz
scummvm-rg350-6e8e0845a16fbe54dffca84d86cc187b0b429557.tar.bz2
scummvm-rg350-6e8e0845a16fbe54dffca84d86cc187b0b429557.zip
DIRECTOR: Fix font parameter reading
-rw-r--r--engines/director/score.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index c4294fdb77..b3f2e02849 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -664,8 +664,9 @@ TextCast::TextCast(Common::SeekableSubReadStreamEndian &stream) {
textType = static_cast<TextType>(stream.readByte());
textAlign = static_cast<TextAlignType>(stream.readUint16());
stream.skip(6); //palinfo
- //for now, just supposition
- fontId = stream.readUint32();
+
+ int t = stream.readUint32();
+ assert(t == 0); // So far we saw only 0 here
initialRect = Score::readRect(stream);
textShadow = static_cast<SizeType>(stream.readByte());
@@ -676,8 +677,11 @@ TextCast::TextCast(Common::SeekableSubReadStreamEndian &stream) {
textFlags.push_back(kTextFlagAutoTab);
if (flags & 0x4)
textFlags.push_back(kTextFlagDoNotWrap);
- //again supposition
- fontSize = stream.readUint16();
+
+ //TODO: FIXME: guesswork
+ fontId = stream.readByte();
+ fontSize = stream.readByte();
+
modified = 0;
}