aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2017-07-28 14:33:57 +0200
committerEugene Sandulenko2017-08-01 10:42:21 +0200
commitbfb757c3c0d3e7b1281ae3059e31cd53742644ab (patch)
treec2d62a4468df2214e367181ce0c187093890ca3f
parent2092c10d3306126f180f8017627754134350c032 (diff)
downloadscummvm-rg350-bfb757c3c0d3e7b1281ae3059e31cd53742644ab.tar.gz
scummvm-rg350-bfb757c3c0d3e7b1281ae3059e31cd53742644ab.tar.bz2
scummvm-rg350-bfb757c3c0d3e7b1281ae3059e31cd53742644ab.zip
GRAPHICS: Load Mac font heights too (still unused)
-rw-r--r--graphics/fonts/macfont.cpp4
-rw-r--r--graphics/fonts/macfont.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/graphics/fonts/macfont.cpp b/graphics/fonts/macfont.cpp
index 9ddb5a6c71..80c1dc4435 100644
--- a/graphics/fonts/macfont.cpp
+++ b/graphics/fonts/macfont.cpp
@@ -328,10 +328,8 @@ bool MacFONTFont::loadFont(Common::SeekableReadStream &stream, MacFontFamily *fa
}
if (_data._fontType & kFontTypeImageHeightTable) {
- warning("Skipping image height table");
-
for (uint16 i = 0; i < glyphCount; i++)
- stream.readUint16BE();
+ _data._glyphs[i].height = stream.readUint16BE();
}
free(bitmapOffsets);
diff --git a/graphics/fonts/macfont.h b/graphics/fonts/macfont.h
index 874d304337..b2e1fb0d11 100644
--- a/graphics/fonts/macfont.h
+++ b/graphics/fonts/macfont.h
@@ -102,12 +102,14 @@ struct MacGlyph {
void clear() {
bitmapOffset = 0;
width = 0;
+ height = 0;
bitmapWidth = 0;
kerningOffset = 0;
}
uint16 bitmapOffset;
byte width;
+ uint16 height;
uint16 bitmapWidth;
int kerningOffset;
};