From 5dd6214611a050cde26fdd7875911b30873bac46 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Tue, 30 Oct 2012 21:18:03 +0000 Subject: [PATCH] - populate defaults for english to avoid transifex over-writing values in other languages --- source/glest_game/global/core_data.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/glest_game/global/core_data.cpp b/source/glest_game/global/core_data.cpp index aa2c29b0..59e6c3c6 100644 --- a/source/glest_game/global/core_data.cpp +++ b/source/glest_game/global/core_data.cpp @@ -748,6 +748,7 @@ void CoreData::loadFonts() { string menuFontNameNormalPrefix = config.getString("FontMenuNormalPrefix"); string menuFontNameNormalPostfix = config.getString("FontMenuNormalPostfix"); int menuFontNameNormalSize = computeFontSize(config.getInt("FontMenuNormalBaseSize")); + //printf("#1 menuFontNameNormalSize = %d\n",menuFontNameNormalSize); if(lang.hasString("FontMenuNormalPrefix") == true) { menuFontNameNormalPrefix = lang.get("FontMenuNormalPrefix"); @@ -756,7 +757,8 @@ void CoreData::loadFonts() { menuFontNameNormalPostfix = lang.get("FontMenuNormalPostfix"); } if(lang.hasString("FontMenuNormalBaseSize") == true) { - menuFontNameNormalSize = strToInt(lang.get("FontMenuNormalBaseSize")); + menuFontNameNormalSize = computeFontSize(strToInt(lang.get("FontMenuNormalBaseSize"))); + //printf("#2 menuFontNameNormalSize = %d\n",menuFontNameNormalSize); } string menuFontNameNormal= menuFontNameNormalPrefix + intToStr(menuFontNameNormalSize) + menuFontNameNormalPostfix;