From 2528a366f3e630edb396b38c95247d7510a951b6 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Thu, 17 Mar 2016 13:21:08 -0700 Subject: [PATCH] Finalize CRasterFont reimp --- Runtime/GuiSys/CRasterFont.cpp | 2 +- Runtime/GuiSys/CRasterFont.hpp | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Runtime/GuiSys/CRasterFont.cpp b/Runtime/GuiSys/CRasterFont.cpp index 0bb630368..cbcf2be20 100644 --- a/Runtime/GuiSys/CRasterFont.cpp +++ b/Runtime/GuiSys/CRasterFont.cpp @@ -18,7 +18,7 @@ CRasterFont::CRasterFont(urde::CInputStream& in, urde::IObjectStore& store) x8c_baseline = x8_monoHeight; if (version >= 2) - x90_ = in.readUint32Big(); + x90_lineMargin = in.readUint32Big(); bool tmp1 = in.readBool(); bool tmp2 = in.readBool(); diff --git a/Runtime/GuiSys/CRasterFont.hpp b/Runtime/GuiSys/CRasterFont.hpp index 6fad88ccc..33b1c8841 100644 --- a/Runtime/GuiSys/CRasterFont.hpp +++ b/Runtime/GuiSys/CRasterFont.hpp @@ -112,7 +112,7 @@ class CRasterFont TToken x80_texture; bool x88_ = false; s32 x8c_baseline; - s32 x90_ = 0; + s32 x90_lineMargin = 0; char* fontName; const CGlyph* InternalGetGlyph(wchar_t chr) const @@ -128,11 +128,13 @@ class CRasterFont public: CRasterFont(CInputStream& in, IObjectStore& store); - s32 GetMonoWidth() { return x4_monoWidth; } - s32 GetMonoHeight() { return x8_monoHeight; } - s32 GetMode() { return x2c_mode; } - s32 sub_802FFF5C() { return x90_; } - s32 GetBaseline() { return x8c_baseline; } + s32 GetMonoWidth() const { return x4_monoWidth; } + s32 GetMonoHeight() const { return x8_monoHeight; } + s32 GetMode() const { return x2c_mode; } + s32 GetLineMargin() const { return x90_lineMargin; } + s32 GetCarriageAdvance() const { return GetLineMargin() + GetMonoHeight(); } + + s32 GetBaseline() const { return x8c_baseline; } static s32 KernLookup(const std::vector& kernTable, s32 kernStart, s32 chr) { auto iter = kernTable.cbegin() + kernStart;