fly/flightgear
1
0
Fork 0
Code Activity

Simon Hollier:

Browse source 
don't crash when using --disable-splash-screen and/or if font can't be found
This commit is contained in:
mfranz 2005-05-10 06:26:59 +00:00
parent fb14bdb8ec
commit 51353ead72
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Main/splash.cxx
View file

@ -65,9 +65,6 @@ static fntRenderer info;
void fgSplashInit ( const char *splash_texture ) { void fgSplashInit ( const char *splash_texture ) {
fgRequestRedraw(); fgRequestRedraw();
if (!fgGetBool("/sim/startup/splash-screen"))
return;
SG_LOG( SG_GENERAL, SG_INFO, "Initializing splash screen" ); SG_LOG( SG_GENERAL, SG_INFO, "Initializing splash screen" );
@ -82,11 +79,16 @@ void fgSplashInit ( const char *splash_texture ) {
SGPath path(fontpath); SGPath path(fontpath);
path.append(fontname); path.append(fontname);
font.load((char *)path.c_str()); if (!font.load((char *)path.c_str())) {
SG_LOG( SG_GENERAL, SG_ALERT, "Error loading font " << path.str() );
return;
}
info.setFont(&font); info.setFont(&font);
info.setPointSize(fontsize); info.setPointSize(fontsize);
if (!fgGetBool("/sim/startup/splash-screen"))
return;
splash.bind(); splash.bind();
@ -185,7 +187,7 @@ void fgSplashUpdate ( float alpha ) {
glEnd(); glEnd();
} }
if (progress_text && fgGetBool("/sim/startup/splash-progress", true)) { if (info.getFont() && progress_text && fgGetBool("/sim/startup/splash-progress", true)) {
glEnable(GL_ALPHA_TEST); glEnable(GL_ALPHA_TEST);
glEnable(GL_BLEND); glEnable(GL_BLEND);
glAlphaFunc(GL_GREATER, 0.1f); glAlphaFunc(GL_GREATER, 0.1f);