aboutsummaryrefslogtreecommitdiff
path: root/engines/director
diff options
context:
space:
mode:
authorEugene Sandulenko2017-08-01 10:36:09 +0200
committerEugene Sandulenko2017-08-01 10:42:22 +0200
commit73c5c85210d47829d933dc8a10a7bda772569fa4 (patch)
tree612dd887d5e2ad6605f86122da1af09192c01f69 /engines/director
parent115a7407e974198450cc7bffeaf664c98c44f72a (diff)
downloadscummvm-rg350-73c5c85210d47829d933dc8a10a7bda772569fa4.tar.gz
scummvm-rg350-73c5c85210d47829d933dc8a10a7bda772569fa4.tar.bz2
scummvm-rg350-73c5c85210d47829d933dc8a10a7bda772569fa4.zip
DIRECTOR: Clarified STXT field names
Diffstat (limited to 'engines/director')
-rw-r--r--engines/director/stxt.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/director/stxt.cpp b/engines/director/stxt.cpp
index 5d5515b4c6..071a629cb6 100644
--- a/engines/director/stxt.cpp
+++ b/engines/director/stxt.cpp
@@ -47,22 +47,22 @@ Stxt::Stxt(Common::SeekableSubReadStreamEndian &textStream) {
while (formattingCount) {
uint32 formatStartOffset = textStream.readUint32();
- uint16 unk1f = textStream.readUint16();
- uint16 unk2f = textStream.readUint16();
+ uint16 height = textStream.readUint16();
+ uint16 ascent = textStream.readUint16();
_fontId = textStream.readUint16();
_textSlant = textStream.readByte();
- byte unk3f = textStream.readByte();
+ byte padding = textStream.readByte();
_fontSize = textStream.readUint16();
_palinfo1 = textStream.readUint16();
_palinfo2 = textStream.readUint16();
_palinfo3 = textStream.readUint16();
- debugC(3, kDebugText, "Stxt init: formattingCount: %u, formatStartOffset: %d, unk1: %d unk2: %d, fontId: %d, textSlant: %d",
- formattingCount, formatStartOffset, unk1f, unk2f, _fontId, _textSlant);
+ debugC(3, kDebugText, "Stxt init: formattingCount: %u, formatStartOffset: %d, height: %d ascent: %d, fontId: %d, textSlant: %d",
+ formattingCount, formatStartOffset, height, ascent, _fontId, _textSlant);
- debugC(3, kDebugText, " unk3: %d, fontSize: %d, p0: %x p1: %x p2: %x", unk3f, _fontSize, _palinfo1, _palinfo2, _palinfo3);
+ debugC(3, kDebugText, " fontSize: %d, p0: %x p1: %x p2: %x", _fontSize, _palinfo1, _palinfo2, _palinfo3);
assert(prevPos <= formatStartOffset); // If this is triggered, we have to implement sorting
@@ -81,9 +81,9 @@ Stxt::Stxt(Common::SeekableSubReadStreamEndian &textStream) {
debugCN(4, kDebugText, "*");
- _ftext += Common::String::format("\001\015%c%c%c%c%c%c%c%c%c%c%c%c",
+ _ftext += Common::String::format("\001\015%c%c%c%c%c%c%c%c%c%c%c",
(_fontId >> 8) & 0xff, _fontId & 0xff,
- _textSlant & 0xff, unk3f & 0xff,
+ _textSlant & 0xff,
(_fontSize >> 8) & 0xff, _fontSize & 0xff,
(_palinfo1 >> 8) & 0xff, _palinfo1 & 0xff,
(_palinfo2 >> 8) & 0xff, _palinfo2 & 0xff,