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

Font LinBiolinum_Re-0.6.4.ttf is default now and some default values are set according to this font.

This commit is contained in:
Titus Tscharntke 2011-10-04 23:49:34 +00:00
parent 36a5deb916
commit a011cb3b26
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/main/main.cpp
View File

@ -2694,8 +2694,6 @@ int glestMain(int argc, char** argv) {
lang.loadStrings(language);
if( lang.hasString("FONT_BASE_SIZE")) {
// 256 for English
// 30000 for Chinese
Font::baseSize = strToInt(lang.get("FONT_BASE_SIZE"));
}

6
source/shared_lib/sources/graphics/font.cpp
View File

@ -42,11 +42,11 @@ bool Font::fontIsRightToLeft = false;
// in 3D render mode
float Font::scaleFontValue = 0.80;
// This value is used for centering font text vertically (height)
float Font::scaleFontValueCenterHFactor = 3.0;
float Font::scaleFontValueCenterHFactor = 4.0;
//float Font::scaleFontValue = 1.0;
//float Font::scaleFontValueCenterHFactor = 4.0;
int Font::baseSize = 0;
int Font::baseSize = 3;
#ifdef USE_FTGL
@ -55,7 +55,7 @@ string Font::langHeightText = TextFTGL::langHeightText;
#else
int Font::faceResolution = 72;
int Font::faceResolution = 720;
string Font::langHeightText = "yW";
#endif

2
source/shared_lib/sources/graphics/gl/font_textFTGL.cpp
View File

@ -381,7 +381,7 @@ const char* TextFTGL::findFont(const char *firstFontToTry) {
}
string data_path = Text::DEFAULT_FONT_PATH;
string defaultFont = data_path + "data/core/fonts/LiberationSans-Regular.ttf";
string defaultFont = data_path + "data/core/fonts/LinBiolinum_Re-0.6.4.ttf";
tryFont = defaultFont;
#ifdef WIN32
replaceAll(tryFont, "/", "\\");