[Scummvm-cvs-logs] scummvm master -> 6895ea9ea1738569e2bffc9c0f1692eb32d0838e

lordhoto lordhoto at gmail.com
Sun Jan 29 19:19:47 CET 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6895ea9ea1 GUI: Fix compilation with --disable-translation.


Commit: 6895ea9ea1738569e2bffc9c0f1692eb32d0838e
    https://github.com/scummvm/scummvm/commit/6895ea9ea1738569e2bffc9c0f1692eb32d0838e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-29T10:18:36-08:00

Commit Message:
GUI: Fix compilation with --disable-translation.

Changed paths:
    gui/ThemeEngine.cpp



diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index fb8db00..74dc9de 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)






More information about the Scummvm-git-logs mailing list