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

- fix for about screen (avoid using Vera font seems buggy)

This commit is contained in:
Mark Vejvoda 2011-06-28 15:39:19 +00:00
parent 0e897ee94f
commit 8c2d76b589
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/glest_game/facilities/game_util.cpp
View File

@ -151,11 +151,16 @@ string getAboutString2(int i){
string getTeammateName(int i) {
switch(i) {
case 0: return "Marti<EFBFBD>o Figueroa";
case 1: return "Jos<EFBFBD> Luis Gonz<6E>lez";
case 2: return "Tucho Fern<72>ndez";
case 3: return "Jos<EFBFBD> Zanni";
case 4: return "F<EFBFBD>lix Men<65>ndez";
case 0: return "Martiño Figueroa";
//case 0: return "Martino Figueroa";
case 1: return "José Luis González";
//case 1: return "Jose Luis Gonzalez";
case 2: return "Tucho Fernández";
//case 2: return "Tucho Fernandez";
case 3: return "José Zanni";
//case 3: return "Jose Zanni";
case 4: return "Félix Menéndez";
//case 4: return "Felix Menendez";
case 5: return "Marcos Caruncho";
case 6: return "Matthias Braun";
case 7: return "Titus Tscharntke";

1
source/glest_game/menu/menu_state_about.cpp
View File

@ -80,6 +80,7 @@ MenuStateAbout::MenuStateAbout(Program *program, MainMenu *mainMenu) :
labelTeammateName[i].init(100 + i * 180, 500);
labelTeammateRole[i].registerGraphicComponent(containerName, "labelTeammateRole" + intToStr(i));
labelTeammateRole[i].init(100 + i * 180, 520);
labelTeammateName[i].setText(getTeammateName(i));
labelTeammateRole[i].setText(getTeammateRole(i));
}

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

@ -36,7 +36,7 @@ int Font::charCount = 256;
std::string Font::fontTypeName = "Times New Roman";
bool Font::fontIsMultibyte = false;
bool Font::forceLegacyFonts = false;
float FontMetrics::DEFAULT_Y_OFFSET_FACTOR = 0.0f;
float FontMetrics::DEFAULT_Y_OFFSET_FACTOR = 2.0f;
bool Font::fontIsRightToLeft = false;
float Font::scaleFontValue = 0.75;
//int Font::scaleFontYOffset = 0;

11
source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp
View File

@ -408,9 +408,14 @@ void TextRenderer3DGl::specialFTGLErrorCheckWorkaround(string text) {
if(error) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("\n\nIn [%s::%s Line: %d] error = %d for text [%s]\n\n",__FILE__,__FUNCTION__,__LINE__,error,text.c_str());
if(currentFTGLErrorCount > 0) {
printf("error = %d for text [%s]\n",error,text.c_str());
assertGlWithErrorNumber(error);
if(currentFTGLErrorCount > 5) {
printf("\n**FTGL Error = %d for text [%s] currentFTGLErrorCount = %d\n\n",error,text.c_str(),currentFTGLErrorCount);
fflush(stdout);
//assertGlWithErrorNumber(error);
}
else {
//printf("\n**FTGL #2 Error = %d for text [%s] currentFTGLErrorCount = %d\n\n",error,text.c_str(),currentFTGLErrorCount);
}
currentFTGLErrorCount++;