Changes to go along with small interface changes in simgear/sound/libsgsound

[flightgear.git] / src / Main / splash.cxx

diff --git a/src/Main/splash.cxx b/src/Main/splash.cxx
index f0af0a0dff17610593d7bff540dcfd33f3a80b7c..ce9d4361ea09fe8174a47c490c88fca5ecfd1621 100644 (file)
--- a/src/Main/splash.cxx
+++ b/src/Main/splash.cxx
@@ -34,10 +34,10 @@
 #  include <windows.h>
 #endif
 
-#include FG_GLUT_H
-
 #include <string.h>
 
+#include <GL/glu.h>
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/screen/texture.hxx>
 #include <simgear/math/sg_random.h>
@@ -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);