diff options
| author | Johannes Schickel | 2012-01-07 02:51:50 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2012-01-29 16:26:20 +0100 |
| commit | d21ae1aa40f7ef5442d98c377800a0157af069c8 (patch) | |
| tree | 1807abeb88d130e73f969accc763c247e731a522 /gui/ThemeParser.cpp | |
| parent | 843b9f96655feda8c78450d9236b09330bdb6bd1 (diff) | |
| download | scummvm-rg350-d21ae1aa40f7ef5442d98c377800a0157af069c8.tar.gz scummvm-rg350-d21ae1aa40f7ef5442d98c377800a0157af069c8.tar.bz2 scummvm-rg350-d21ae1aa40f7ef5442d98c377800a0157af069c8.zip | |
GUI: Add support for loading TTF files with ISO-8859-1 charset.
Diffstat (limited to 'gui/ThemeParser.cpp')
| -rw-r--r-- | gui/ThemeParser.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp index ea50dcc061..9ccdedd564 100644 --- a/gui/ThemeParser.cpp +++ b/gui/ThemeParser.cpp @@ -176,8 +176,15 @@ bool ThemeParser::parserCallback_font(ParserNode *node) { return true; } + // Default to a point size of 12. + int pointsize = 12; + if (node->values.contains("point_size")) { + if (sscanf(node->values["point_size"].c_str(), "%d", &pointsize) != 1 || pointsize <= 0) + return parserError(Common::String::format("Font \"%s\" has invalid point size \"%s\"", node->values["id"].c_str(), node->values["point_size"].c_str())); + } + TextData textDataId = parseTextDataId(node->values["id"]); - if (!_theme->addFont(textDataId, node->values["file"])) + if (!_theme->addFont(textDataId, node->values["file"], node->values["scalable_file"], pointsize)) return parserError("Error loading Font in theme engine."); return true; |