mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-26 17:34:24 +02:00
Code Issues Projects Releases Wiki Activity

- fix for about screen, placement of some items

Browse Source
This commit is contained in:
Mark Vejvoda
2011-06-28 15:56:22 +00:00
parent 8c2d76b589
commit 8d300f06a4
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,21 +47,20 @@ MenuStateAbout::MenuStateAbout(Program *program, MainMenu *mainMenu) :
labelAdditionalCredits.init(500, 700); labelAdditionalCredits.init(500, 700);
labelAdditionalCredits.setText(additionalCredits); labelAdditionalCredits.setText(additionalCredits);
if(additionalCredits == ""){ if(additionalCredits == "") {
for(int i= 0; i < aboutStringCount1; ++i){ for(int i= 0; i < aboutStringCount1; ++i){
labelAbout1[i].registerGraphicComponent(containerName, "labelAbout1" + intToStr(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)); labelAbout1[i].setText(getAboutString1(i));
} }
for(int i= 0; i < aboutStringCount2; ++i){ for(int i= 0; i < aboutStringCount2; ++i){
labelAbout2[i].registerGraphicComponent(containerName, "labelAbout2" + intToStr(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)); labelAbout2[i].setText(getAboutString2(i));
} }
} }
else else {
{
for(int i= 0; i < aboutStringCount1; ++i){ for(int i= 0; i < aboutStringCount1; ++i){
labelAbout1[i].registerGraphicComponent(containerName, "labelAbout1" + intToStr(i)); labelAbout1[i].registerGraphicComponent(containerName, "labelAbout1" + intToStr(i));
labelAbout1[i].init(100, 700 - i * 20); labelAbout1[i].init(100, 700 - i * 20);

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

@@ -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); printf("\n**FTGL Error = %d for text [%s] currentFTGLErrorCount = %d\n\n",error,text.c_str(),currentFTGLErrorCount);
fflush(stdout); fflush(stdout);
//assertGlWithErrorNumber(error); assertGlWithErrorNumber(error);
} }
else { else {
//printf("\n**FTGL #2 Error = %d for text [%s] currentFTGLErrorCount = %d\n\n",error,text.c_str(),currentFTGLErrorCount); //printf("\n**FTGL #2 Error = %d for text [%s] currentFTGLErrorCount = %d\n\n",error,text.c_str(),currentFTGLErrorCount);