X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Ffg_init.cxx;h=dae961c619a0fde92b6cc2a2c45f6ec87e694747;hb=a4e81f4ff075e6a3c0c2ea1b5a29c0bcdfdbc671;hp=c0922a59840294710189dddbff927296057313b7;hpb=08bbb83b8e3a009c49c30bb6fedec61be59d6ba3;p=flightgear.git

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index c0922a598..dae961c61 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -39,6 +39,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>		// strcmp()
 
 
 #if defined( unix ) || defined( __CYGWIN__ )
@@ -63,12 +64,18 @@
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/timing/sg_time.hxx>
+#include <simgear/timing/lowleveltime.h>
 
 #include <Aircraft/aircraft.hxx>
 #include <FDM/UIUCModel/uiuc_aircraftdir.h>
 #include <Airports/runways.hxx>
 #include <Airports/simple.hxx>
 #include <ATC/ATCdisplay.hxx>
+#include <ATC/ATCmgr.hxx>
+#include <ATC/atislist.hxx>
+#include <ATC/towerlist.hxx>
+#include <ATC/approachlist.hxx>
+#include <ATC/AIMgr.hxx>
 #include <Autopilot/auto_gui.hxx>
 #include <Autopilot/newauto.hxx>
 #include <Cockpit/cockpit.hxx>
@@ -78,15 +85,18 @@
 #include <FDM/ADA.hxx>
 #include <FDM/Balloon.h>
 #include <FDM/External.hxx>
-#include <FDM/JSBSim.hxx>
+#include <FDM/ExternalNet.hxx>
+#include <FDM/JSBSim/JSBSim.hxx>
 #include <FDM/LaRCsim.hxx>
 #include <FDM/MagicCarpet.hxx>
+#include <FDM/UFO.hxx>
 #include <FDM/NullFDM.hxx>
 #include <FDM/YASim/YASim.hxx>
 #include <Include/general.hxx>
 #include <Input/input.hxx>
 // #include <Joystick/joystick.hxx>
 #include <Objects/matlib.hxx>
+#include <Model/acmodel.hxx>
 #include <Navaids/fixlist.hxx>
 #include <Navaids/ilslist.hxx>
 #include <Navaids/mkrbeacons.hxx>
@@ -95,16 +105,16 @@
 #include <Scenery/tilemgr.hxx>
 #include <Sound/fg_fx.hxx>
 #include <Sound/soundmgr.hxx>
-#include <Time/event.hxx>
+#include <Time/FGEventMgr.hxx>
 #include <Time/light.hxx>
 #include <Time/sunpos.hxx>
 #include <Time/moonpos.hxx>
 #include <Time/tmp.hxx>
 
-#ifndef FG_OLD_WEATHER
+#ifdef FG_WEATHERCM
 #  include <WeatherCM/FGLocalWeatherDatabase.h>
 #else
-#  include <Weather/weather.hxx>
+#  include <Environment/environment_mgr.hxx>
 #endif
 
 #include "fg_init.hxx"
@@ -113,6 +123,7 @@
 #include "fg_props.hxx"
 #include "options.hxx"
 #include "globals.hxx"
+#include "logger.hxx"
 #include "viewmgr.hxx"
 
 #if defined(FX) && defined(XMESA)
@@ -135,7 +146,7 @@ bool fgInitFGRoot ( int argc, char **argv ) {
 
 #if defined( unix ) || defined( __CYGWIN__ )
     // Next check home directory for .fgfsrc.hostname file
-    if ( root == "" ) {
+    if ( root.empty() ) {
 	envp = ::getenv( "HOME" );
 	if ( envp != NULL ) {
 	    SGPath config( envp );
@@ -150,7 +161,7 @@ bool fgInitFGRoot ( int argc, char **argv ) {
 #endif
 
     // Next check home directory for .fgfsrc file
-    if ( root == "" ) {
+    if ( root.empty() ) {
 	envp = ::getenv( "HOME" );
 	if ( envp != NULL ) {
 	    SGPath config( envp );
@@ -160,7 +171,7 @@ bool fgInitFGRoot ( int argc, char **argv ) {
     }
     
     // Next check if fg-root is set as an env variable
-    if ( root == "" ) {
+    if ( root.empty() ) {
 	envp = ::getenv( "FG_ROOT" );
 	if ( envp != NULL ) {
 	    root = envp;
@@ -169,7 +180,7 @@ bool fgInitFGRoot ( int argc, char **argv ) {
 
     // Otherwise, default to a random compiled-in location if we can't
     // find fg-root any other way.
-    if ( root == "" ) {
+    if ( root.empty() ) {
 #if defined( __CYGWIN__ )
         root = "/FlightGear";
 #elif defined( WIN32 )
@@ -222,14 +233,7 @@ bool fgInitConfig ( int argc, char **argv ) {
     SGPath props_path(globals->get_fg_root());
     props_path.append("preferences.xml");
     SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences");
-    try {
-      readProperties(props_path.str(), globals->get_props());
-    } catch (const sg_exception &e) {
-      string message = "Error reading global preferences: ";
-      message += e.getFormattedMessage();
-      SG_LOG(SG_INPUT, SG_ALERT, message);
-      exit(2);
-    }
+    readProperties(props_path.str(), globals->get_props());
     SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
 
     // Read the default aircraft config file.
@@ -240,7 +244,7 @@ bool fgInitConfig ( int argc, char **argv ) {
       aircraft_path.append(aircraft);
       aircraft_path.concat("-set.xml");
       SG_LOG(SG_INPUT, SG_INFO, "Reading default aircraft: " << aircraft
-	     << " from " << props_path.str());
+	     << " from " << aircraft_path.str());
       try {
 	readProperties(aircraft_path.str(), globals->get_props());
       } catch (const sg_exception &e) {
@@ -261,8 +265,8 @@ bool fgInitConfig ( int argc, char **argv ) {
     config.append( "system.fgfsrc" );
     fgParseOptions(config.str());
 
-    char name[256];
 #if defined( unix ) || defined( __CYGWIN__ )
+    char name[256];
     // Check for $fg_root/system.fgfsrc.hostname
     gethostname( name, 256 );
     config.concat( "." );
@@ -346,6 +350,29 @@ bool fgSetPosFromAirportID( const string& id ) {
 }
 
 
+
+// Set current tower position lon/lat given an airport id
+bool fgSetTowerPosFromAirportID( const string& id, double hdg ) {
+    FGAirport a;
+    // tower height hard coded for now...
+    float towerheight=50.0f;
+
+    // make a little off the heading for 1 runway airports...
+    float fudge_lon = fabs(sin(hdg)) * .003f;
+    float fudge_lat = .003f - fudge_lon;
+
+    if ( fgFindAirportID( id, &a ) ) {
+	fgSetDouble("/sim/tower/longitude-deg",  a.longitude + fudge_lon);
+	fgSetDouble("/sim/tower/latitude-deg",  a.latitude + fudge_lat);
+        fgSetDouble("/sim/tower/altitude-ft", a.elevation + towerheight);
+	return true;
+    } else {
+	return false;
+    }
+
+}
+
+
 // Set current_options lon/lat given an airport id and heading (degrees)
 bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     FGRunway r;
@@ -467,6 +494,34 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
 }
 
 
+void fgSetPosFromGlideSlope(void) {
+    double gs = fgGetDouble("/velocities/glideslope");
+    double od = fgGetDouble("/sim/startup/offset-distance");
+    double alt = fgGetDouble("/position/altitude-ft");
+    
+    //if glideslope and offset-distance are set and altitude is
+    //not, calculate the initial altitude
+    if( fabs(gs) > 0.01 && fabs(od) > 0.1 && alt < -9990 ) {
+    	od *= SG_NM_TO_METER * SG_METER_TO_FEET;
+	alt = fabs(od*tan(gs));
+	fgSetDouble("/position/altitude-ft",alt);
+	fgSetBool("/sim/startup/onground", false);
+	SG_LOG(SG_GENERAL,SG_INFO, "Calculated altitude as: " << alt  << " ft");
+    } else if( fabs(gs) > 0.01 && alt > 0 && fabs(od) < 0.1) {
+    	od  = alt/tan(gs);
+	od *= -1*SG_FEET_TO_METER * SG_METER_TO_NM;
+	fgSetDouble("/sim/startup/offset-distance",od);
+	SG_LOG(SG_GENERAL,SG_INFO, "Calculated offset distance as: " 
+	                               << od  << " nm");
+    } else if( fabs(gs) > 0.01 ) {
+    	SG_LOG(SG_GENERAL,SG_ALERT, "Glideslope given but not altitude" 
+	                          << " or offset-distance.  Resetting"
+				  << " glideslope to zero" );
+        fgSetDouble("/velocities/glideslope",0);				  
+    }				   
+	                              
+}    			
+
 // General house keeping initializations
 bool fgInitGeneral( void ) {
     string root;
@@ -523,21 +578,56 @@ void fgInitFDM() {
     const string &model = fgGetString("/sim/flight-model");
 
     try {
-	if (model == "larcsim") {
+	if ( model == "larcsim" ) {
 	    cur_fdm_state = new FGLaRCsim( dt );
-	} else if (model == "jsb") {
+	} else if ( model == "jsb" ) {
 	    cur_fdm_state = new FGJSBsim( dt );
-	} else if (model == "ada") {
+	} else if ( model == "ada" ) {
 	    cur_fdm_state = new FGADA( dt );
-	} else if (model == "balloon") {
+	} else if ( model == "balloon" ) {
 	    cur_fdm_state = new FGBalloonSim( dt );
-	} else if (model == "magic") {
+	} else if ( model == "magic" ) {
 	    cur_fdm_state = new FGMagicCarpet( dt );
-	} else if (model == "external") {
+	} else if ( model == "ufo" ) {
+	    cur_fdm_state = new FGUFO( dt );
+	} else if ( model == "external" ) {
 	    cur_fdm_state = new FGExternal( dt );
-	} else if (model == "null") {
+	} else if ( model.find("network") == 0 ) {
+            string host = "localhost";
+            int port1 = 5501;
+            int port2 = 5502;
+            int port3 = 5503;
+            string net_options = model.substr(8);
+            string::size_type begin, end;
+            begin = 0;
+            // host
+            end = net_options.find( ",", begin );
+            if ( end != string::npos ) {
+                host = net_options.substr(begin, end - begin);
+                begin = end + 1;
+            }
+            // port1
+            end = net_options.find( ",", begin );
+            if ( end != string::npos ) {
+                port1 = atoi( net_options.substr(begin, end - begin).c_str() );
+                begin = end + 1;
+            }
+            // port2
+            end = net_options.find( ",", begin );
+            if ( end != string::npos ) {
+                port2 = atoi( net_options.substr(begin, end - begin).c_str() );
+                begin = end + 1;
+            }
+            // port3
+            end = net_options.find( ",", begin );
+            if ( end != string::npos ) {
+                port3 = atoi( net_options.substr(begin, end - begin).c_str() );
+                begin = end + 1;
+            }
+	    cur_fdm_state = new FGExternalNet( dt, host, port1, port2, port3 );
+	} else if ( model == "null" ) {
 	    cur_fdm_state = new FGNullFDM( dt );
-	} else if (model == "yasim") {
+	} else if ( model == "yasim" ) {
 	    cur_fdm_state = new YASim( dt );
 	} else {
 	    SG_LOG(SG_GENERAL, SG_ALERT,
@@ -554,32 +644,70 @@ void fgInitFDM() {
 
 // Initialize view parameters
 void fgInitView() {
-    // Initialize pilot view
+  // force update of model so that viewer can get some data...
+  globals->get_aircraft_model()->update(0);
+  // run update for current view so that data is current...
+  globals->get_viewmgr()->update(0);
+}
+
+
+SGTime *fgInitTime() {
+    // Initialize time
     static const SGPropertyNode *longitude
 	= fgGetNode("/position/longitude-deg");
     static const SGPropertyNode *latitude
 	= fgGetNode("/position/latitude-deg");
-    static const SGPropertyNode *altitude
-	= fgGetNode("/position/altitude-ft");
+    static const SGPropertyNode *cur_time_override
+	= fgGetNode("/sim/time/cur-time-override", true);
+
+    SGPath zone( globals->get_fg_root() );
+    zone.append( "Timezone" );
+    SGTime *t = new SGTime( longitude->getDoubleValue()
+                              * SGD_DEGREES_TO_RADIANS,
+                            latitude->getDoubleValue()
+                              * SGD_DEGREES_TO_RADIANS,
+                            zone.str(),
+                            cur_time_override->getLongValue() );
+
+    // Handle potential user specified time offsets
+    time_t cur_time = t->get_cur_time();
+    time_t currGMT = sgTimeGetGMT( gmtime(&cur_time) );
+    time_t systemLocalTime = sgTimeGetGMT( localtime(&cur_time) );
+    time_t aircraftLocalTime = 
+        sgTimeGetGMT( fgLocaltime(&cur_time, t->get_zonename() ) );
+
+    // Okay, we now have six possible scenarios
+    int offset = fgGetInt("/sim/startup/time-offset");
+    const string &offset_type = fgGetString("/sim/startup/time-offset-type");
+    if (offset_type == "system-offset") {
+        globals->set_warp( offset );
+    } else if (offset_type == "gmt-offset") {
+        globals->set_warp( offset - (currGMT - systemLocalTime) );
+    } else if (offset_type == "latitude-offset") {
+        globals->set_warp( offset - (aircraftLocalTime - systemLocalTime) );
+    } else if (offset_type == "system") {
+        globals->set_warp( offset - cur_time );
+    } else if (offset_type == "gmt") {
+        globals->set_warp( offset - currGMT );
+    } else if (offset_type == "latitude") {
+        globals->set_warp( offset - (aircraftLocalTime - systemLocalTime) - 
+                           cur_time ); 
+    } else {
+        SG_LOG( SG_GENERAL, SG_ALERT,
+                "FG_TIME::Unsupported offset type " << offset_type );
+        exit( -1 );
+    }
 
-    FGViewerRPH *pilot_view
-        = (FGViewerRPH *)globals->get_viewmgr()->get_view( 0 );
+    SG_LOG( SG_GENERAL, SG_INFO, "After time init, warp = " 
+            << globals->get_warp() );
 
-    pilot_view->set_geod_view_pos( longitude->getDoubleValue()
-				     * SGD_DEGREES_TO_RADIANS, 
-				   latitude->getDoubleValue()
-				     * SGD_DEGREES_TO_RADIANS,
-				   altitude->getDoubleValue()
-				     * SG_FEET_TO_METER );
-    pilot_view->set_rph( cur_fdm_state->get_Phi(),
-			 cur_fdm_state->get_Theta(),
-			 cur_fdm_state->get_Psi() );
+    globals->set_warp_delta( 0 );
 
-    // set current view to 0 (first) which is our main pilot view
-    globals->set_current_view( pilot_view );
+    t->update( 0.0, 0.0,
+               cur_time_override->getLongValue(),
+               globals->get_warp() );
 
-    SG_LOG( SG_GENERAL, SG_DEBUG, "  abs_view_pos = "
-	    << globals->get_current_view()->get_abs_view_pos());
+    return t;
 }
 
 
@@ -612,26 +740,42 @@ bool fgInitSubsystems( void ) {
 	exit(-1);
     }
 
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the event manager subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+    global_events.init();
+
+    // Output event stats every 60 seconds
+    global_events.Register( "FGEventMgr::print_stats()",
+			    &global_events, &FGEventMgr::print_stats,
+			    60000 );
+
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the scenery management subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    scenery.init();
-    scenery.bind();
-
     if ( global_tile_mgr.init() ) {
 	// Load the local scenery data
-	global_tile_mgr.update( fgGetDouble("/position/longitude-deg"),
-				fgGetDouble("/position/latitude-deg") );
+	double visibility_meters = fgGetDouble("/environment/visibility-m");
+		
+	global_tile_mgr.update( longitude->getDoubleValue(),
+				latitude->getDoubleValue(),
+				visibility_meters );
     } else {
     	SG_LOG( SG_GENERAL, SG_ALERT, "Error in Tile Manager initialization!" );
 	exit(-1);
     }
 
+    // cause refresh of viewer scenery timestamps every 15 seconds...
+    global_events.Register( "FGTileMgr::refresh_view_timestamps()",
+			    &global_tile_mgr, &FGTileMgr::refresh_view_timestamps,
+			    15000 );
+
     SG_LOG( SG_GENERAL, SG_DEBUG,
     	    "Current terrain elevation after tile mgr init " <<
-	    scenery.get_cur_elev() );
+	    globals->get_scenery()->get_cur_elev() );
 
 
     ////////////////////////////////////////////////////////////////////
@@ -645,19 +789,6 @@ bool fgInitSubsystems( void ) {
     fgAircraftInit();   // In the future this might not be the case.
 
 
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the event manager subsystem.
-    ////////////////////////////////////////////////////////////////////
-
-    global_events.Init();
-
-    // Output event stats every 60 seconds
-    global_events.Register( "fgEVENT_MGR::PrintStats()",
-			    fgMethodCallback<fgEVENT_MGR>( &global_events,
-						   &fgEVENT_MGR::PrintStats),
-			    fgEVENT::FG_EVENT_READY, 60000 );
-
-
     ////////////////////////////////////////////////////////////////////
     // Initialize the view manager subsystem.
     ////////////////////////////////////////////////////////////////////
@@ -674,19 +805,29 @@ bool fgInitSubsystems( void ) {
     // things for correctly orienting the sky.
     fgUpdateSunPos();
     fgUpdateMoonPos();
-    global_events.Register( "fgUpdateSunPos()", fgUpdateSunPos,
-			    fgEVENT::FG_EVENT_READY, 60000);
-    global_events.Register( "fgUpdateMoonPos()", fgUpdateMoonPos,
-			    fgEVENT::FG_EVENT_READY, 60000);
+    global_events.Register( "fgUpdateSunPos()", &fgUpdateSunPos,
+			    60000);
+    global_events.Register( "fgUpdateMoonPos()", &fgUpdateMoonPos,
+			    60000);
 
     // Initialize Lighting interpolation tables
     l->Init();
 
+    // force one lighting update to make it right to start with...
+    l->Update();
     // update the lighting parameters (based on sun angle)
     global_events.Register( "fgLight::Update()",
-			    fgMethodCallback<fgLIGHT>( &cur_light_params,
-						       &fgLIGHT::Update),
-			    fgEVENT::FG_EVENT_READY, 30000 );
+			    &cur_light_params, &fgLIGHT::Update,
+			    30000 );
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the logger.
+    ////////////////////////////////////////////////////////////////////
+    
+    globals->set_logger(new FGLogger);
+    globals->get_logger()->init();
+    globals->get_logger()->bind();
 
 
     ////////////////////////////////////////////////////////////////////
@@ -694,8 +835,8 @@ bool fgInitSubsystems( void ) {
     ////////////////////////////////////////////////////////////////////
 
     // update the current timezone each 30 minutes
-    global_events.Register( "fgUpdateLocalTime()", fgUpdateLocalTime,
-			    fgEVENT::FG_EVENT_READY, 1800000);
+    global_events.Register( "fgUpdateLocalTime()", &fgUpdateLocalTime,
+			    30*60*1000 );
 
 
     ////////////////////////////////////////////////////////////////////
@@ -703,7 +844,7 @@ bool fgInitSubsystems( void ) {
     ////////////////////////////////////////////////////////////////////
 
     // Initialize the weather modeling subsystem
-#ifndef FG_OLD_WEATHER
+#ifdef FG_WEATHERCM
     // Initialize the WeatherDatabase
     SG_LOG(SG_GENERAL, SG_INFO, "Creating LocalWeatherDatabase");
     sgVec3 position;
@@ -714,7 +855,7 @@ bool fgInitSubsystems( void ) {
 
     FGLocalWeatherDatabase::DatabaseWorkingType working_type;
 
-    if (fgGetString("/environment/weather/working-type") == "internet")
+    if (!strcmp(fgGetString("/environment/weather/working-type"), "internet"))
     {
       working_type = FGLocalWeatherDatabase::use_internet;
     } else {
@@ -741,10 +882,11 @@ bool fgInitSubsystems( void ) {
     WeatherDatabase = FGLocalWeatherDatabase::theFGLocalWeatherDatabase;
 
     // register the periodic update of the weather
-    global_events.Register( "weather update", fgUpdateWeatherDatabase,
-                            fgEVENT::FG_EVENT_READY, 30000);
+    global_events.Register( "weather update", &fgUpdateWeatherDatabase,
+                            30000);
 #else
-    current_weather.Init();
+    globals->get_environment_mgr()->init();
+    globals->get_environment_mgr()->bind();
 #endif
 
     ////////////////////////////////////////////////////////////////////
@@ -777,21 +919,47 @@ bool fgInitSubsystems( void ) {
     // Initialize ATC list management and query systems
     ////////////////////////////////////////////////////////////////////
 
-    //DCL
     SG_LOG(SG_GENERAL, SG_INFO, "  ATIS");
     current_atislist = new FGATISList;
     SGPath p_atis( globals->get_fg_root() );
     p_atis.append( "ATC/default.atis" );
     current_atislist->init( p_atis );
 
+    SG_LOG(SG_GENERAL, SG_INFO, "  Tower");
+    current_towerlist = new FGTowerList;
+    SGPath p_tower( globals->get_fg_root() );
+    p_tower.append( "ATC/default.tower" );
+    current_towerlist->init( p_tower );
+
+    SG_LOG(SG_GENERAL, SG_INFO, "  Approach");
+    current_approachlist = new FGApproachList;
+    SGPath p_approach( globals->get_fg_root() );
+    p_approach.append( "ATC/default.approach" );
+    current_approachlist->init( p_approach );
+
     ////////////////////////////////////////////////////////////////////
     // Initialise ATC display system
     ////////////////////////////////////////////////////////////////////
 
-    //DCL
     SG_LOG(SG_GENERAL, SG_INFO, "  ATC Display");
-    current_atcdisplay = new FGATCDisplay;
-    current_atcdisplay->init();   
+    globals->set_ATC_display(new FGATCDisplay);
+    globals->get_ATC_display()->init(); 
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialise the ATC Manager 
+    ////////////////////////////////////////////////////////////////////
+
+    SG_LOG(SG_GENERAL, SG_INFO, "  ATC Manager");
+    globals->set_ATC_mgr(new FGATCMgr);
+    globals->get_ATC_mgr()->init(); 
+    
+    ////////////////////////////////////////////////////////////////////
+    // Initialise the AI Manager 
+    ////////////////////////////////////////////////////////////////////
+
+    SG_LOG(SG_GENERAL, SG_INFO, "  AI Manager");
+    // globals->set_AI_mgr(new FGAIMgr);
+    // globals->get_AI_mgr()->init();     
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the built-in commands.
@@ -841,23 +1009,16 @@ bool fgInitSubsystems( void ) {
     }
 
 
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the joystick subsystem.
-    ////////////////////////////////////////////////////////////////////
-
-    // if ( ! fgJoystickInit() ) {
-    //   SG_LOG( SG_GENERAL, SG_ALERT, "Error in Joystick initialization!" );
-    // }
-
-
     ////////////////////////////////////////////////////////////////////
     // Initialize the autopilot subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    current_autopilot = new FGAutopilot;
-    current_autopilot->init();
+    globals->set_autopilot(new FGAutopilot);
+    globals->get_autopilot()->init();
+    globals->get_autopilot()->bind();
 
-    // initialize the gui parts of the autopilot
+				// FIXME: these should go in the
+				// GUI initialization code, not here.
     fgAPAdjustInit();
     NewTgtAirportInit();
     NewHeadingInit();
@@ -942,25 +1103,23 @@ void fgReInitSubsystems( void )
     }
     
     // Initialize the Scenery Management subsystem
-    scenery.init();
-
-#if 0
-    if( global_tile_mgr.init() ) {
-	Load the local scenery data
-	global_tile_mgr.update( longitude->getDoubleValue(),
-				latitude->getDoubleValue() );
-    } else {
-    	SG_LOG( SG_GENERAL, SG_ALERT, "Error in Tile Manager initialization!" );
-        exit(-1);
-    }
-#endif
+    // FIXME, what really needs to get initialized here, at the time
+    // this was commented out, scenery.init() was a noop
+    // scenery.init();
 
     fgInitFDM();
+    
+    // allocates structures so must happen before any of the flight
+    // model or control parameters are set
+    fgAircraftInit();   // In the future this might not be the case.
+
+    // copy viewer settings into current-view path
+    globals->get_viewmgr()->copyToCurrent();
 
     fgInitView();
 
     globals->get_controls()->reset_all();
-    current_autopilot->reset();
+    globals->get_autopilot()->reset();
 
     fgUpdateSunPos();
     fgUpdateMoonPos();
@@ -971,3 +1130,4 @@ void fgReInitSubsystems( void )
 	fgSetBool("/sim/freeze/master", false);
     }
 }
+