X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fsplash.cxx;h=ce9d4361ea09fe8174a47c490c88fca5ecfd1621;hb=df472fe0f5542d570feab42ce9ac1076a07419eb;hp=f0af0a0dff17610593d7bff540dcfd33f3a80b7c;hpb=465d13b04522d733cebc0648e7c2845f5314858e;p=flightgear.git diff --git a/src/Main/splash.cxx b/src/Main/splash.cxx index f0af0a0df..ce9d4361e 100644 --- a/src/Main/splash.cxx +++ b/src/Main/splash.cxx @@ -34,10 +34,10 @@ # include #endif -#include FG_GLUT_H - #include +#include + #include #include #include @@ -46,6 +46,8 @@ #include "globals.hxx" #include "fg_props.hxx" #include "splash.hxx" +#include "fg_os.hxx" + static SGTexture splash; @@ -58,11 +60,11 @@ void fgSplashInit ( const char *splash_texture ) { splash.bind(); SGPath tpath( globals->get_fg_root() ); - if (splash_texture == NULL) { + if (splash_texture == NULL || !strcmp(splash_texture, "")) { // load in the texture data int num = (int)(sg_random() * 5.0 + 1.0); - char num_str[256]; - sprintf(num_str, "%d", num); + char num_str[5]; + snprintf(num_str, 4, "%d", num); tpath.append( "Textures/Splash" ); tpath.concat( num_str ); @@ -141,8 +143,6 @@ void fgSplashUpdate ( double progress, float alpha ) { glTexCoord2f(0.0, 1.0); glVertex2f(xmin, ymax); glEnd(); - glutSwapBuffers(); - glEnable(GL_DEPTH_TEST); glEnable(GL_LIGHTING); glDisable(GL_TEXTURE_2D);