]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/fg_init.cxx
Patch from Jim Wilson:
[flightgear.git] / src / Main / fg_init.cxx
index 90c2edd194df841c80189c22ae616a5f4e8f3ed5..a78638f0b0fbe18cdf650e3d532e50973dca9b1c 100644 (file)
 #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 <Autopilot/auto_gui.hxx>
 #include <Autopilot/newauto.hxx>
 #include <Cockpit/cockpit.hxx>
 #include <FDM/ADA.hxx>
 #include <FDM/Balloon.h>
 #include <FDM/External.hxx>
-#include <FDM/JSBSim.hxx>
+#include <FDM/JSBSim/JSBSim.hxx>
 #include <FDM/LaRCsim.hxx>
 #include <FDM/MagicCarpet.hxx>
+#include <FDM/NullFDM.hxx>
+#include <FDM/YASim/YASim.hxx>
 #include <Include/general.hxx>
 #include <Input/input.hxx>
 // #include <Joystick/joystick.hxx>
 #include <Navaids/navlist.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
+#include <Sound/fg_fx.hxx>
+#include <Sound/soundmgr.hxx>
 #include <Time/event.hxx>
 #include <Time/light.hxx>
 #include <Time/sunpos.hxx>
 #include <Time/moonpos.hxx>
 #include <Time/tmp.hxx>
 
-#ifndef FG_OLD_WEATHER
+#ifndef FG_NEW_ENVIRONMENT
 #  include <WeatherCM/FGLocalWeatherDatabase.h>
 #else
-#  include <Weather/weather.hxx>
+#  include <Environment/environment_mgr.hxx>
 #endif
 
 #include "fg_init.hxx"
 #include "fg_props.hxx"
 #include "options.hxx"
 #include "globals.hxx"
+#include "viewmgr.hxx"
 
 #if defined(FX) && defined(XMESA)
 #include <GL/xmesa.h>
@@ -218,16 +227,35 @@ bool fgInitConfig ( int argc, char **argv ) {
     SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences");
     try {
       readProperties(props_path.str(), globals->get_props());
-    } catch (const sg_io_exception &e) {
+    } catch (const sg_exception &e) {
       string message = "Error reading global preferences: ";
-      message += e.getMessage();
-      message += "\n at ";
-      message += e.getLocation().asString();
+      message += e.getFormattedMessage();
       SG_LOG(SG_INPUT, SG_ALERT, message);
       exit(2);
     }
     SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
 
+    // Read the default aircraft config file.
+    string aircraft = fgGetString("/sim/aircraft", "");
+    if (aircraft.size() > 0) {
+      SGPath aircraft_path(globals->get_fg_root());
+      aircraft_path.append("Aircraft");
+      aircraft_path.append(aircraft);
+      aircraft_path.concat("-set.xml");
+      SG_LOG(SG_INPUT, SG_INFO, "Reading default aircraft: " << aircraft
+            << " from " << aircraft_path.str());
+      try {
+       readProperties(aircraft_path.str(), globals->get_props());
+      } catch (const sg_exception &e) {
+       string message = "Error reading default aircraft: ";
+       message += e.getFormattedMessage();
+       SG_LOG(SG_INPUT, SG_ALERT, message);
+       exit(2);
+      }
+    } else {
+      SG_LOG(SG_INPUT, SG_ALERT, "No default aircraft specified");
+    }
+
     // Attempt to locate and parse the various config files in order
     // from least precidence to greatest precidence
 
@@ -263,7 +291,7 @@ bool fgInitConfig ( int argc, char **argv ) {
 
     // Parse remaining command line options
     // These will override anything specified in a config file
-    fgParseOptions(argc, argv);
+    fgParseArgs(argc, argv);
 
     return true;
 }
@@ -328,71 +356,71 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     double found_dir = 0.0;
 
     if ( id.length() ) {
-       // set initial position from runway and heading
-
-       SGPath path( globals->get_fg_root() );
-       path.append( "Airports" );
-       path.append( "runways.mk4" );
-       FGRunways runways( path.c_str() );
-
-       SG_LOG( SG_GENERAL, SG_INFO,
-               "Attempting to set starting position from runway code "
-               << id << " heading " << tgt_hdg );
-
-       // SGPath inpath( globals->get_fg_root() );
-       // inpath.append( "Airports" );
-       // inpath.append( "apt_simple" );
-       // airports.load( inpath.c_str() );
-
-       // SGPath outpath( globals->get_fg_root() );
-       // outpath.append( "Airports" );
-       // outpath.append( "simple.gdbm" );
-       // airports.dump_gdbm( outpath.c_str() );
-
-       if ( ! runways.search( id, &r ) ) {
-           SG_LOG( SG_GENERAL, SG_ALERT,
-                   "Failed to find " << id << " in database." );
-           return false;
-       }
-
-       double diff;
-       double min_diff = 360.0;
-
-       while ( r.id == id ) {
-           // forward direction
-           diff = tgt_hdg - r.heading;
-           while ( diff < -180.0 ) { diff += 360.0; }
-           while ( diff >  180.0 ) { diff -= 360.0; }
-           diff = fabs(diff);
-           SG_LOG( SG_GENERAL, SG_INFO,
-                   "Runway " << r.rwy_no << " heading = " << r.heading <<
-                   " diff = " << diff );
-           if ( diff < min_diff ) {
-               min_diff = diff;
-               found_r = r;
-               found_dir = 0;
-           }
-
-           // reverse direction
-           diff = tgt_hdg - r.heading - 180.0;
-           while ( diff < -180.0 ) { diff += 360.0; }
-           while ( diff >  180.0 ) { diff -= 360.0; }
-           diff = fabs(diff);
-           SG_LOG( SG_GENERAL, SG_INFO,
-                   "Runway -" << r.rwy_no << " heading = " <<
-                   r.heading + 180.0 <<
-                   " diff = " << diff );
-           if ( diff < min_diff ) {
-               min_diff = diff;
-               found_r = r;
-               found_dir = 180.0;
-           }
-
-           runways.next( &r );
-       }
-
-       SG_LOG( SG_GENERAL, SG_INFO, "closest runway = " << found_r.rwy_no
-               << " + " << found_dir );
+        // set initial position from runway and heading
+
+        SGPath path( globals->get_fg_root() );
+        path.append( "Airports" );
+        path.append( "runways.mk4" );
+        FGRunways runways( path.c_str() );
+
+        SG_LOG( SG_GENERAL, SG_INFO,
+                "Attempting to set starting position from runway code "
+                << id << " heading " << tgt_hdg );
+
+        // SGPath inpath( globals->get_fg_root() );
+        // inpath.append( "Airports" );
+        // inpath.append( "apt_simple" );
+        // airports.load( inpath.c_str() );
+
+        // SGPath outpath( globals->get_fg_root() );
+        // outpath.append( "Airports" );
+        // outpath.append( "simple.gdbm" );
+        // airports.dump_gdbm( outpath.c_str() );
+
+        if ( ! runways.search( id, &r ) ) {
+            SG_LOG( SG_GENERAL, SG_ALERT,
+                    "Failed to find " << id << " in database." );
+            return false;
+        }
+
+        double diff;
+        double min_diff = 360.0;
+
+        while ( r.id == id ) {
+            // forward direction
+            diff = tgt_hdg - r.heading;
+            while ( diff < -180.0 ) { diff += 360.0; }
+            while ( diff >  180.0 ) { diff -= 360.0; }
+            diff = fabs(diff);
+            SG_LOG( SG_GENERAL, SG_INFO,
+                    "Runway " << r.rwy_no << " heading = " << r.heading <<
+                    " diff = " << diff );
+            if ( diff < min_diff ) {
+                min_diff = diff;
+                found_r = r;
+                found_dir = 0;
+            }
+
+            // reverse direction
+            diff = tgt_hdg - r.heading - 180.0;
+            while ( diff < -180.0 ) { diff += 360.0; }
+            while ( diff >  180.0 ) { diff -= 360.0; }
+            diff = fabs(diff);
+            SG_LOG( SG_GENERAL, SG_INFO,
+                    "Runway -" << r.rwy_no << " heading = " <<
+                    r.heading + 180.0 <<
+                    " diff = " << diff );
+            if ( diff < min_diff ) {
+                min_diff = diff;
+                found_r = r;
+                found_dir = 180.0;
+            }
+
+            runways.next( &r );
+        }
+
+        SG_LOG( SG_GENERAL, SG_INFO, "closest runway = " << found_r.rwy_no
+                << " + " << found_dir );
 
     } else {
        return false;
@@ -427,6 +455,7 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
        lat2=olat;
        lon2=olon;
     }
+       
     fgSetDouble("/position/longitude-deg",  lon2 );
     fgSetDouble("/position/latitude-deg",  lat2 );
     fgSetDouble("/orientation/heading-deg", heading );
@@ -440,6 +469,33 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     return true;
 }
 
+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 ) {
@@ -456,7 +512,7 @@ bool fgInitGeneral( void ) {
     if ( ! root.length() ) {
        // No root path set? Then bail ...
        SG_LOG( SG_GENERAL, SG_ALERT,
-               "Cannot continue without environment variable FG_ROOT"
+               "Cannot continue without a path to the base package "
                << "being defined." );
        exit(-1);
     }
@@ -464,14 +520,14 @@ bool fgInitGeneral( void ) {
 
 #if defined(FX) && defined(XMESA)
     // initialize full screen flag
-    global_fullscreen = false;
+    globals->set_fullscreen(false);
     if ( strstr ( general.get_glRenderer(), "Glide" ) ) {
        // Test for the MESA_GLX_FX env variable
        if ( (mesa_win_state = getenv( "MESA_GLX_FX" )) != NULL) {
            // test if we are fullscreen mesa/glide
            if ( (mesa_win_state[0] == 'f') ||
                 (mesa_win_state[0] == 'F') ) {
-               global_fullscreen = true;
+               globals->set_fullscreen(true);
            }
        }
     }
@@ -481,11 +537,154 @@ bool fgInitGeneral( void ) {
 }
 
 
+// Initialize the flight model subsystem.  This just creates the
+// object.  The actual fdm initialization is delayed until we get a
+// proper scenery elevation hit.  This is checked for in main.cxx
+
+void fgInitFDM() {
+
+    if ( cur_fdm_state ) {
+        delete cur_fdm_state;
+        cur_fdm_state = 0;
+    }
+
+    double dt = 1.0 / fgGetInt("/sim/model-hz");
+    aircraft_dir = fgGetString("/sim/aircraft-dir");
+    const string &model = fgGetString("/sim/flight-model");
+
+    try {
+       if (model == "larcsim") {
+           cur_fdm_state = new FGLaRCsim( dt );
+       } else if (model == "jsb") {
+           cur_fdm_state = new FGJSBsim( dt );
+       } else if (model == "ada") {
+           cur_fdm_state = new FGADA( dt );
+       } else if (model == "balloon") {
+           cur_fdm_state = new FGBalloonSim( dt );
+       } else if (model == "magic") {
+           cur_fdm_state = new FGMagicCarpet( dt );
+       } else if (model == "external") {
+           cur_fdm_state = new FGExternal( dt );
+       } else if (model == "null") {
+           cur_fdm_state = new FGNullFDM( dt );
+       } else if (model == "yasim") {
+           cur_fdm_state = new YASim( dt );
+       } else {
+           SG_LOG(SG_GENERAL, SG_ALERT,
+                  "Unrecognized flight model '" << model
+                  << "', cannot init flight dynamics model.");
+           exit(-1);
+       }
+    } catch ( ... ) {
+       SG_LOG(SG_GENERAL, SG_ALERT, "FlightGear aborting\n\n");
+       exit(-1);
+    }
+}
+
+
+// Initialize view parameters
+void fgInitView() {
+    // Initialize pilot view
+    static const SGPropertyNode *longitude
+       = fgGetNode("/position/longitude-deg");
+    static const SGPropertyNode *latitude
+       = fgGetNode("/position/latitude-deg");
+    static const SGPropertyNode *altitude
+       = fgGetNode("/position/altitude-ft");
+
+    FGViewerRPH *pilot_view
+        = (FGViewerRPH *)globals->get_viewmgr()->get_view( 0 );
+
+    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() );
+
+    // set current view to 0 (first) which is our main pilot view
+    globals->set_current_view( pilot_view );
+
+    SG_LOG( SG_GENERAL, SG_DEBUG, "  abs_view_pos = "
+           << globals->get_current_view()->get_abs_view_pos());
+}
+
+
+SGTime *fgInitTime() {
+    // Initialize time
+    static const SGPropertyNode *longitude
+       = fgGetNode("/position/longitude-deg");
+    static const SGPropertyNode *latitude
+       = fgGetNode("/position/latitude-deg");
+    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 );
+    }
+
+    SG_LOG( SG_GENERAL, SG_INFO, "After time init, warp = " 
+            << globals->get_warp() );
+
+    globals->set_warp_delta( 0 );
+
+    t->update( 0.0, 0.0,
+               cur_time_override->getLongValue(),
+               globals->get_warp() );
+
+    return t;
+}
+
+
 // This is the top level init routine which calls all the other
 // initialization routines.  If you are adding a subsystem to flight
 // gear, its initialization call should located in this routine.
 // Returns non-zero if a problem encountered.
 bool fgInitSubsystems( void ) {
+    static const SGPropertyNode *longitude
+       = fgGetNode("/position/longitude-deg");
+    static const SGPropertyNode *latitude
+       = fgGetNode("/position/latitude-deg");
+    static const SGPropertyNode *altitude
+       = fgGetNode("/position/altitude-ft");
+
     fgLIGHT *l = &cur_light_params;
 
     SG_LOG( SG_GENERAL, SG_INFO, "Initialize Subsystems");
@@ -497,9 +696,8 @@ bool fgInitSubsystems( void ) {
     ////////////////////////////////////////////////////////////////////
 
     SGPath mpath( globals->get_fg_root() );
-    mpath.append( "materials" );
-    if ( material_lib.load( mpath.str() ) ) {
-    } else {
+    mpath.append( "materials.xml" );
+    if ( ! material_lib.load( mpath.str() ) ) {
        SG_LOG( SG_GENERAL, SG_ALERT, "Error loading material lib!" );
        exit(-1);
     }
@@ -509,17 +707,13 @@ bool fgInitSubsystems( void ) {
     // Initialize the scenery management subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    if ( fgSceneryInit() ) {
-       // Material lib initialized ok.
-    } else {
-       SG_LOG( SG_GENERAL, SG_ALERT, "Error in Scenery initialization!" );
-       exit(-1);
-    }
+    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") );
+       global_tile_mgr.update( longitude->getDoubleValue(),
+                               latitude->getDoubleValue() );
     } else {
        SG_LOG( SG_GENERAL, SG_ALERT, "Error in Tile Manager initialization!" );
        exit(-1);
@@ -527,45 +721,15 @@ bool fgInitSubsystems( void ) {
 
     SG_LOG( SG_GENERAL, SG_DEBUG,
            "Current terrain elevation after tile mgr init " <<
-           scenery.cur_elev );
+           scenery.get_cur_elev() );
 
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the flight model subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    double dt = 1.0 / fgGetInt("/sim/model-hz");
-    // cout << "dt = " << dt << endl;
-
-    aircraft_dir = fgGetString("/sim/aircraft-dir");
-    const string &model = fgGetString("/sim/flight-model");
-    try {
-       if (model == "larcsim") {
-           cur_fdm_state = new FGLaRCsim( dt );
-       } else if (model == "jsb") {
-           cur_fdm_state = new FGJSBsim( dt );
-       } else if (model == "ada") {
-           cur_fdm_state = new FGADA( dt );
-       } else if (model == "balloon") {
-           cur_fdm_state = new FGBalloonSim( dt );
-       } else if (model == "magic") {
-           cur_fdm_state = new FGMagicCarpet( dt );
-       } else if (model == "external") {
-           cur_fdm_state = new FGExternal( dt );
-       } else {
-           SG_LOG(SG_GENERAL, SG_ALERT,
-                  "Unrecognized flight model '" << model
-                  << ", can't init aircraft");
-           exit(-1);
-       }
-    } catch ( ... ) {
-       SG_LOG(SG_GENERAL, SG_ALERT, "FlightGear aborting\n\n");
-       exit(-1);
-    }
-
-    cur_fdm_state->init();
-    cur_fdm_state->bind();
-    
+    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.
@@ -588,32 +752,7 @@ bool fgInitSubsystems( void ) {
     // Initialize the view manager subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    // Initialize win_ratio parameters
-    for ( int i = 0; i < globals->get_viewmgr()->size(); ++i ) {
-       globals->get_viewmgr()->get_view(i)->
-           set_win_ratio( fgGetInt("/sim/startup/xsize") /
-                          fgGetInt("/sim/startup/ysize") );
-    }
-
-    // Initialize pilot view
-    FGViewerRPH *pilot_view =
-       (FGViewerRPH *)globals->get_viewmgr()->get_view( 0 );
-
-    pilot_view->set_geod_view_pos( cur_fdm_state->get_Longitude(), 
-                                  cur_fdm_state->get_Lat_geocentric(), 
-                                  cur_fdm_state->get_Altitude() *
-                                  SG_FEET_TO_METER );
-    pilot_view->set_sea_level_radius( cur_fdm_state->get_Sea_level_radius() *
-                                     SG_FEET_TO_METER ); 
-    pilot_view->set_rph( cur_fdm_state->get_Phi(),
-                        cur_fdm_state->get_Theta(),
-                        cur_fdm_state->get_Psi() );
-
-    // set current view to 0 (first) which is our main pilot view
-    globals->set_current_view( pilot_view );
-
-    SG_LOG( SG_GENERAL, SG_DEBUG, "  abs_view_pos = "
-           << globals->get_current_view()->get_abs_view_pos());
+    fgInitView();
 
 
     ////////////////////////////////////////////////////////////////////
@@ -654,7 +793,7 @@ bool fgInitSubsystems( void ) {
     ////////////////////////////////////////////////////////////////////
 
     // Initialize the weather modeling subsystem
-#ifndef FG_OLD_WEATHER
+#ifndef FG_NEW_ENVIRONMENT
     // Initialize the WeatherDatabase
     SG_LOG(SG_GENERAL, SG_INFO, "Creating LocalWeatherDatabase");
     sgVec3 position;
@@ -695,7 +834,8 @@ bool fgInitSubsystems( void ) {
     global_events.Register( "weather update", fgUpdateWeatherDatabase,
                             fgEVENT::FG_EVENT_READY, 30000);
 #else
-    current_weather.Init();
+    globals->get_environment_mgr()->init();
+    globals->get_environment_mgr()->bind();
 #endif
 
     ////////////////////////////////////////////////////////////////////
@@ -724,6 +864,32 @@ bool fgInitSubsystems( void ) {
     p_fix.append( "Navaids/default.fix" );
     current_fixlist->init( p_fix );
 
+    ////////////////////////////////////////////////////////////////////
+    // 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 );
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialise ATC display system
+    ////////////////////////////////////////////////////////////////////
+
+    SG_LOG(SG_GENERAL, SG_INFO, "  ATC Display");
+    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();     
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the built-in commands.
@@ -731,6 +897,25 @@ bool fgInitSubsystems( void ) {
     fgInitCommands();
 
 
+#ifdef ENABLE_AUDIO_SUPPORT
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the sound subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+    globals->set_soundmgr(new FGSoundMgr);
+    globals->get_soundmgr()->init();
+    globals->get_soundmgr()->bind();
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the sound-effects subsystem.
+    ////////////////////////////////////////////////////////////////////
+    globals->set_fx(new FGFX);
+    globals->get_fx()->init();
+    globals->get_fx()->bind();
+
+#endif
+
     ////////////////////////////////////////////////////////////////////
     // Initialize the radio stack subsystem.
     ////////////////////////////////////////////////////////////////////
@@ -771,12 +956,11 @@ bool fgInitSubsystems( void ) {
     current_autopilot->init();
 
     // initialize the gui parts of the autopilot
+    fgAPAdjustInit();
     NewTgtAirportInit();
-    fgAPAdjustInit() ;
     NewHeadingInit();
     NewAltitudeInit();
 
-    
     ////////////////////////////////////////////////////////////////////
     // Initialize I/O subsystem.
     ////////////////////////////////////////////////////////////////////
@@ -810,8 +994,8 @@ bool fgInitSubsystems( void ) {
     // Initialize the controls subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    controls.init();
-    controls.bind();
+    globals->get_controls()->init();
+    globals->get_controls()->bind();
 
 
     ////////////////////////////////////////////////////////////////////
@@ -838,54 +1022,46 @@ bool fgInitSubsystems( void ) {
 
 void fgReInitSubsystems( void )
 {
+    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 *master_freeze
+       = fgGetNode("/sim/freeze/master");
+
     SG_LOG( SG_GENERAL, SG_INFO,
-           "/position/altitude = " << fgGetDouble("/position/altitude-ft") );
+           "/position/altitude = " << altitude->getDoubleValue() );
 
-    bool freeze = globals->get_freeze();
-    if( !freeze )
-        globals->set_freeze( true );
+    bool freeze = master_freeze->getBoolValue();
+    if ( !freeze ) {
+       fgSetBool("/sim/freeze/master", true);
+    }
     
     // Initialize the Scenery Management subsystem
-    if ( ! fgSceneryInit() ) {
-       SG_LOG( SG_GENERAL, SG_ALERT, "Error in Scenery initialization!" );
-       exit(-1);
-    }
+    scenery.init();
 
+#if 0
     if( global_tile_mgr.init() ) {
-       // Load the local scenery data
-       global_tile_mgr.update( fgGetDouble("/position/longitude-deg"),
-                               fgGetDouble("/position/latitude-deg") );
+       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);
+        exit(-1);
     }
+#endif
 
-    // Initialize view parameters
-    FGViewerRPH *pilot_view =
-       (FGViewerRPH *)globals->get_viewmgr()->get_view( 0 );
-
-    pilot_view->set_view_offset( 0.0 );
-    pilot_view->set_goal_view_offset( 0.0 );
-
-    pilot_view->set_geod_view_pos( cur_fdm_state->get_Longitude(), 
-                                  cur_fdm_state->get_Lat_geocentric(), 
-                                  cur_fdm_state->get_Altitude() *
-                                  SG_FEET_TO_METER );
-    pilot_view->set_sea_level_radius( cur_fdm_state->get_Sea_level_radius() *
-                                     SG_FEET_TO_METER ); 
-    pilot_view->set_rph( cur_fdm_state->get_Phi(),
-                        cur_fdm_state->get_Theta(),
-                        cur_fdm_state->get_Psi() );
-
-    // set current view to 0 (first) which is our main pilot view
-    globals->set_current_view( pilot_view );
-
-    SG_LOG( SG_GENERAL, SG_DEBUG, "  abs_view_pos = "
-           << globals->get_current_view()->get_abs_view_pos());
+    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.
 
-    cur_fdm_state->init();
+    fgInitView();
 
-    controls.reset_all();
+    globals->get_controls()->reset_all();
     current_autopilot->reset();
 
     fgUpdateSunPos();
@@ -893,6 +1069,7 @@ void fgReInitSubsystems( void )
     cur_light_params.Update();
     fgUpdateLocalTime();
 
-    if( !freeze )
-        globals->set_freeze( false );
+    if ( !freeze ) {
+       fgSetBool("/sim/freeze/master", false);
+    }
 }