diff options
| author | Johannes Schickel | 2012-01-29 19:18:36 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2012-01-29 19:18:36 +0100 |
| commit | 6895ea9ea1738569e2bffc9c0f1692eb32d0838e (patch) | |
| tree | 71bbd172696b2507ddac943c5417ceae73ac4cdc | |
| parent | fa401a2d3d26e1f41e1831dec5f35f1120ec8910 (diff) | |
| download | scummvm-rg350-6895ea9ea1738569e2bffc9c0f1692eb32d0838e.tar.gz scummvm-rg350-6895ea9ea1738569e2bffc9c0f1692eb32d0838e.tar.bz2 scummvm-rg350-6895ea9ea1738569e2bffc9c0f1692eb32d0838e.zip | |
GUI: Fix compilation with --disable-translation.
| -rw-r--r-- | gui/ThemeEngine.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index fb8db003f1..74dc9de1c2 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -571,11 +571,11 @@ bool ThemeEngine::addFont(TextData textId, const Common::String &file, const Com _texts[textId]->_fontPtr = _font; } else { Common::String localized = FontMan.genLocalizedFontFilename(file); - const Common::String charset( + const Common::String charset #ifdef USE_TRANSLATION - TransMan.getCurrentCharset() + (TransMan.getCurrentCharset()) #endif - ); + ; // Try localized fonts _texts[textId]->_fontPtr = loadFont(localized, scalableFile, charset, pointsize, textId == kTextDataDefault); @@ -1412,7 +1412,13 @@ const Graphics::Font *ThemeEngine::loadScalableFont(const Common::String &filena for (Common::ArchiveMemberList::const_iterator i = members.begin(), end = members.end(); i != end; ++i) { Common::SeekableReadStream *stream = (*i)->createReadStream(); if (stream) { - font = Graphics::loadTTFFont(*stream, pointsize, false, TransMan.getCharsetMapping()); + font = Graphics::loadTTFFont(*stream, pointsize, false, +#ifdef USE_TRANSLATION + TransMan.getCharsetMapping() +#else + 0 +#endif + ); delete stream; if (font) |