Don't care about light volumes when picking in the scenegraph

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

diff --git a/src/Main/splash.cxx b/src/Main/splash.cxx
index a21064cabadba863f19fe85cc87d02b5cce791e4..a170a31f16fbc9e0f835d2bde333eb60ac0b5c0e 100644 (file)
--- a/src/Main/splash.cxx
+++ b/src/Main/splash.cxx
@@ -46,7 +46,10 @@
 #include <simgear/math/sg_random.h>
 #include <simgear/misc/sg_path.hxx>
 
-#include <GUI/new_gui.hxx>
+#include <plib/fnt.h>
+
+#include "GUI/FGFontCache.hxx"
+#include "GUI/FGColor.hxx"
 
 #include "globals.hxx"
 #include "fg_props.hxx"
@@ -146,8 +149,8 @@ public:
 
 char *genNameString()
 {
-    string website = "http://www.flightgear.org";
-    string programName = "FlightGear";
+    std::string website = "http://www.flightgear.org";
+    std::string programName = "FlightGear";
     char *name = new char[26];
     name[20] = 114;
     name[8] = 119;
@@ -192,7 +195,7 @@ static osg::Node* fgCreateSplashCamera()
       tpath = globals->resolve_maybe_aircraft_path(splash_texture);
       if (tpath.isNull())
       {
-          SG_LOG( SG_GENERAL, SG_ALERT, "Cannot find splash screen file '" << splash_texture
+          SG_LOG( SG_VIEW, SG_ALERT, "Cannot find splash screen file '" << splash_texture
                   << "'. Using default." );
       }
   }
@@ -363,11 +366,11 @@ osg::Node* fgCreateSplashNode() {
 
 // Initialize the splash screen
 void fgSplashInit () {
-  SG_LOG( SG_GENERAL, SG_INFO, "Initializing splash screen" );
+  SG_LOG( SG_VIEW, SG_INFO, "Initializing splash screen" );
   globals->get_renderer()->splashinit();
 }
 
 void fgSplashProgress ( const char *text ) {
-  SG_LOG( SG_GENERAL, SG_INFO, "Splash screen progress " << text );
+  SG_LOG( SG_VIEW, SG_INFO, "Splash screen progress " << text );
   fgSetString("/sim/startup/splash-progress-text", text);
 }