[Scummvm-cvs-logs] scummvm master -> a826c4422f823ec1bbd1902f05c549f94b75c8e1

[eriktorbjorn]

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:
a826c4422f JANITORIAL: Unbreak building with --disable-translation


Commit: a826c4422f823ec1bbd1902f05c549f94b75c8e1
    https://github.com/scummvm/scummvm/commit/a826c4422f823ec1bbd1902f05c549f94b75c8e1
Author: eriktorbjorn (eriktorbjorn at users.sourceforge.net)
Date: 2011-06-06T21:21:04-07:00

Commit Message:
JANITORIAL: Unbreak building with --disable-translation

I don't know if there is more code that can be removed when
disabling translations, but this is the obvious obstacle.

Changed paths:
    graphics/fontman.cpp



diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp
index 6f1d282..f40cf97 100644
--- a/graphics/fontman.cpp
+++ b/graphics/fontman.cpp
@@ -117,11 +117,13 @@ const Font *FontManager::getFontByUsage(FontUsage usage) const {
 			if (font)
 				return font;
 		}
+#ifdef USE_TRANSLATION
 		// Accept any other font that has the charset in its name
 		for (Common::HashMap<Common::String, const Font *>::const_iterator it = _fontMap.begin() ; it != _fontMap.end() ; ++it) {
 			if (it->_key.contains(TransMan.getCurrentCharset()))
 				return it->_value;
 		}
+#endif
 		// Fallback: return a non localized kGUIFont.
 		// Maybe we should return a null pointer instead?
 		return g_sysfont;