Added a <solve-weight> subtag of the approach/cruise parameters that can

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

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index db7205d82d1d5ad4241014de1e11ad92a253bea9..502207bf2ee0646cb156fff0720c4891c9a005b8 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -54,7 +54,6 @@
 #include <simgear/ephemeris/ephemeris.hxx>
 #include <simgear/scene/model/placement.hxx>
 #include <simgear/math/sg_random.h>
-#include <simgear/route/route.hxx>
 #include <simgear/scene/model/modellib.hxx>
 
 #ifdef FG_USE_CLOUDS_3D
@@ -82,7 +81,6 @@
 #include <ATC/ATCdisplay.hxx>
 #include <ATC/ATCmgr.hxx>
 #include <ATC/AIMgr.hxx>
-#include <Autopilot/newauto.hxx>
 #include <Replay/replay.hxx>
 #include <Time/tmp.hxx>
 #include <Time/fg_timer.hxx>
@@ -341,6 +339,7 @@ void trRenderFrame( void ) {
     // draw the lights
     glFogf (GL_FOG_DENSITY, rwy_exp2_punch_through);
     ssgSetNearFar( scene_nearplane, scene_farplane );
+    ssgCullAndDraw( globals->get_scenery()->get_vasi_lights_root() );
     ssgCullAndDraw( globals->get_scenery()->get_rwy_lights_root() );
 
     ssgCullAndDraw( globals->get_scenery()->get_gnd_lights_root() );
@@ -711,6 +710,7 @@ void fgRenderFrame() {
 
         // draw runway lighting
         if ( draw_otw ) {
+            ssgCullAndDraw( globals->get_scenery()->get_vasi_lights_root() );
             ssgCullAndDraw( globals->get_scenery()->get_rwy_lights_root() );
         }
 
@@ -883,7 +883,6 @@ void fgUpdateTimeDepCalcs() {
         }
 
         if ( ! replay_master->getBoolValue() ) {
-            globals->get_autopilot()->update( delta_time_sec );
             cur_fdm_state->update( delta_time_sec );
         } else {
             FGReplay *r = (FGReplay *)(globals->get_subsystem( "replay" ));
@@ -1237,7 +1236,7 @@ static void fgIdleFunction ( void ) {
     if ( idle_state == 0 ) {
         // Initialize the splash screen right away
         if ( fgGetBool("/sim/startup/splash-screen") ) {
-            fgSplashInit();
+            fgSplashInit(fgGetString("/sim/startup/splash-texture"));
         }
         
         idle_state++;
@@ -1499,9 +1498,6 @@ bool fgMainInit( int argc, char **argv ) {
     // seed the random number generater
     sg_srandom_time();
 
-    SGRoute *route = new SGRoute;
-    globals->set_route( route );
-
     FGControls *controls = new FGControls;
     globals->set_controls( controls );