Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fix font sizes when loading values from lng files

Browse Source
This commit is contained in:
Mark Vejvoda 2012-11-01 00:18:38 +00:00
parent 7010ddd153
commit 3303d382e3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/glest_game/global/core_data.cpp
View File

@ -665,7 +665,7 @@ void CoreData::loadFonts() {
displayFontNamePostfix = lang.get("FontDisplayPostfix"); displayFontNamePostfix = lang.get("FontDisplayPostfix");
} }
if(lang.hasString("FontDisplayBaseSize") == true) { if(lang.hasString("FontDisplayBaseSize") == true) {
displayFontSize = strToInt(lang.get("FontDisplayBaseSize")); displayFontSize = computeFontSize(strToInt(lang.get("FontDisplayBaseSize")));
} }
//printf("displayFontNamePostfix [%s]\n",displayFontNamePostfix.c_str()); //printf("displayFontNamePostfix [%s]\n",displayFontNamePostfix.c_str());
@ -712,7 +712,7 @@ void CoreData::loadFonts() {
displayFontNameSmallPostfix = lang.get("FontDisplayPostfix"); displayFontNameSmallPostfix = lang.get("FontDisplayPostfix");
} }
if(lang.hasString("FontDisplaySmallBaseSize") == true) { if(lang.hasString("FontDisplaySmallBaseSize") == true) {
displayFontNameSmallSize = strToInt(lang.get("FontDisplaySmallBaseSize")); displayFontNameSmallSize = computeFontSize(strToInt(lang.get("FontDisplaySmallBaseSize")));
} }
string displayFontNameSmall = displayFontNameSmallPrefix + intToStr(displayFontNameSmallSize) + displayFontNameSmallPostfix; string displayFontNameSmall = displayFontNameSmallPrefix + intToStr(displayFontNameSmallSize) + displayFontNameSmallPostfix;
@ -804,7 +804,7 @@ void CoreData::loadFonts() {
menuFontNameBigPostfix = lang.get("FontMenuBigPostfix"); menuFontNameBigPostfix = lang.get("FontMenuBigPostfix");
} }
if(lang.hasString("FontMenuBigBaseSize") == true) { if(lang.hasString("FontMenuBigBaseSize") == true) {
menuFontNameBigSize = strToInt(lang.get("FontMenuBigBaseSize")); menuFontNameBigSize = computeFontSize(strToInt(lang.get("FontMenuBigBaseSize")));
} }
string menuFontNameBig= menuFontNameBigPrefix+intToStr(menuFontNameBigSize)+menuFontNameBigPostfix; string menuFontNameBig= menuFontNameBigPrefix+intToStr(menuFontNameBigSize)+menuFontNameBigPostfix;
@ -848,7 +848,7 @@ void CoreData::loadFonts() {
menuFontNameVeryBigPostfix = lang.get("FontMenuBigPostfix"); menuFontNameVeryBigPostfix = lang.get("FontMenuBigPostfix");
} }
if(lang.hasString("FontMenuVeryBigBaseSize") == true) { if(lang.hasString("FontMenuVeryBigBaseSize") == true) {
menuFontNameVeryBigSize = strToInt(lang.get("FontMenuVeryBigBaseSize")); menuFontNameVeryBigSize = computeFontSize(strToInt(lang.get("FontMenuVeryBigBaseSize")));
} }
string menuFontNameVeryBig= menuFontNameVeryBigPrefix + intToStr(menuFontNameVeryBigSize) + menuFontNameVeryBigPostfix; string menuFontNameVeryBig= menuFontNameVeryBigPrefix + intToStr(menuFontNameVeryBigSize) + menuFontNameVeryBigPostfix;
@ -895,7 +895,7 @@ void CoreData::loadFonts() {
consoleFontNamePostfix = lang.get("FontConsolePostfix"); consoleFontNamePostfix = lang.get("FontConsolePostfix");
} }
if(lang.hasString("FontConsoleBaseSize") == true) { if(lang.hasString("FontConsoleBaseSize") == true) {
consoleFontNameSize = strToInt(lang.get("FontConsoleBaseSize")); consoleFontNameSize = computeFontSize(strToInt(lang.get("FontConsoleBaseSize")));
} }
string consoleFontName= consoleFontNamePrefix + intToStr(consoleFontNameSize) + consoleFontNamePostfix; string consoleFontName= consoleFontNamePrefix + intToStr(consoleFontNameSize) + consoleFontNamePostfix;