diff options
| author | Andrew Kurushin | 2005-11-19 12:41:23 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2005-11-19 12:41:23 +0000 |
| commit | 6c828a1c17fc7c98bbd4e565a202fdd91d490369 (patch) | |
| tree | 45cc8fee418687343945145bd11e617fb4439371 /saga/font.h | |
| parent | 88379e7dbe27ccb108df67e1a4387d1c094df564 (diff) | |
| download | scummvm-rg350-6c828a1c17fc7c98bbd4e565a202fdd91d490369.tar.gz scummvm-rg350-6c828a1c17fc7c98bbd4e565a202fdd91d490369.tar.bz2 scummvm-rg350-6c828a1c17fc7c98bbd4e565a202fdd91d490369.zip | |
some Font fixes
svn-id: r19668
Diffstat (limited to 'saga/font.h')
| -rw-r--r-- | saga/font.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/saga/font.h b/saga/font.h index c148c6317f..5896060104 100644 --- a/saga/font.h +++ b/saga/font.h @@ -53,16 +53,6 @@ namespace Saga { #define TEXT_MARGIN 10 #define TEXT_LINESPACING 2 -enum FontId { - kSmallFont, - kMediumFont, - kBigFont, - kIHNMUnknown, - kIHNMFont8, - kIHNMUnknown2, - kIHNMMainFont -}; - enum FontEffectFlags { kFontNormal = 0, kFontOutline = 1 << 0, @@ -151,7 +141,17 @@ class Font { } private: - FontId knownFont2FontIdx(KnownFont font); + enum FontId { + kSmallFont, + kMediumFont, + kBigFont, + kIHNMUnknown, + kIHNMFont8, + kIHNMUnknown2, + kIHNMMainFont + }; + + Font::FontId knownFont2FontIdx(KnownFont font); int getStringWidth(FontId fontId, const char *text, size_t count, FontEffectFlags flags); int getHeight(FontId fontId, const char *text, int width, FontEffectFlags flags); @@ -168,7 +168,6 @@ class Font { return _fonts[fontId]; } -public: int getHeight(FontId fontId) { return getFont(fontId)->normal.header.charHeight; } |