diff --git a/source/glest_game/menu/menu_state_about.cpp b/source/glest_game/menu/menu_state_about.cpp index c62deea9c..d01951f10 100644 --- a/source/glest_game/menu/menu_state_about.cpp +++ b/source/glest_game/menu/menu_state_about.cpp @@ -47,21 +47,20 @@ MenuStateAbout::MenuStateAbout(Program *program, MainMenu *mainMenu) : labelAdditionalCredits.init(500, 700); labelAdditionalCredits.setText(additionalCredits); - if(additionalCredits == ""){ + if(additionalCredits == "") { for(int i= 0; i < aboutStringCount1; ++i){ labelAbout1[i].registerGraphicComponent(containerName, "labelAbout1" + intToStr(i)); - labelAbout1[i].init(100, 750 - i * 20); + labelAbout1[i].init(100, 700 - i * 20); labelAbout1[i].setText(getAboutString1(i)); } for(int i= 0; i < aboutStringCount2; ++i){ labelAbout2[i].registerGraphicComponent(containerName, "labelAbout2" + intToStr(i)); - labelAbout2[i].init(450, 650 - i * 20); + labelAbout2[i].init(450, 620 - i * 20); labelAbout2[i].setText(getAboutString2(i)); } } - else - { + else { for(int i= 0; i < aboutStringCount1; ++i){ labelAbout1[i].registerGraphicComponent(containerName, "labelAbout1" + intToStr(i)); labelAbout1[i].init(100, 700 - i * 20); diff --git a/source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp b/source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp index 6c9d75dcd..51f9e263c 100644 --- a/source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp +++ b/source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp @@ -412,7 +412,7 @@ void TextRenderer3DGl::specialFTGLErrorCheckWorkaround(string text) { printf("\n**FTGL Error = %d for text [%s] currentFTGLErrorCount = %d\n\n",error,text.c_str(),currentFTGLErrorCount); fflush(stdout); - //assertGlWithErrorNumber(error); + assertGlWithErrorNumber(error); } else { //printf("\n**FTGL #2 Error = %d for text [%s] currentFTGLErrorCount = %d\n\n",error,text.c_str(),currentFTGLErrorCount);