X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Ffg_init.cxx;h=5ad9476021430d06c3222f18f74720a1bb372b36;hb=62c6063fa1cbe6256fd497d86e25be99bf1edfb0;hp=81be29a5b57d11d3f1a37b643c95b47d4a600299;hpb=18b2464b4eb292a9211386d01089fe9e8cf23a72;p=flightgear.git

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 81be29a5b..5ad947602 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started August 1997.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -31,12 +31,6 @@
 #  include <math.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
-#include GLUT_H
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>             // strcmp()
@@ -53,42 +47,46 @@
 #endif
 
 #include <simgear/compiler.h>
-#include <simgear/misc/exception.hxx>
 
 #include STL_STRING
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
+#include <simgear/structure/exception.hxx>
+#include <simgear/structure/event_mgr.hxx>
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/misc/sg_path.hxx>
-#ifdef FG_USE_CLOUDS_3D
-#  include <simgear/sky/clouds3d/SkySceneLoader.hpp>
-#  include <simgear/sky/clouds3d/SkyUtil.hpp>
-#endif
+#include <simgear/misc/interpolator.hxx>
+#include <simgear/scene/material/matlib.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/timing/lowleveltime.h>
 
 #include <Aircraft/aircraft.hxx>
-#include <FDM/UIUCModel/uiuc_aircraftdir.h>
+#include <Aircraft/replay.hxx>
+#include <Airports/apt_loader.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/simple.hxx>
+#include <AIModel/AIManager.hxx>
 #include <ATC/ATCdisplay.hxx>
 #include <ATC/ATCmgr.hxx>
 #include <ATC/AIMgr.hxx>
 #include <Autopilot/auto_gui.hxx>
-#include <Autopilot/newauto.hxx>
+#include <Autopilot/route_mgr.hxx>
+#include <Autopilot/xmlauto.hxx>
 #include <Cockpit/cockpit.hxx>
-#include <Cockpit/radiostack.hxx>
 #include <Cockpit/panel.hxx>
 #include <Cockpit/panel_io.hxx>
-#include <FDM/ADA.hxx>
+#ifdef ENABLE_SP_FMDS
+#include <FDM/SP/ADA.hxx>
+#include <FDM/SP/ACMS.hxx>
+#endif
 #include <FDM/Balloon.h>
 #include <FDM/ExternalNet/ExternalNet.hxx>
 #include <FDM/ExternalPipe/ExternalPipe.hxx>
 #include <FDM/JSBSim/JSBSim.hxx>
-#include <FDM/LaRCsim.hxx>
+#include <FDM/LaRCsim/LaRCsim.hxx>
 #include <FDM/MagicCarpet.hxx>
 #include <FDM/UFO.hxx>
 #include <FDM/NullFDM.hxx>
@@ -97,37 +95,28 @@
 #include <Include/general.hxx>
 #include <Input/input.hxx>
 #include <Instrumentation/instrument_mgr.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>
+#include <AIModel/submodel.hxx>
+#include <AIModel/AIManager.hxx>
+#include <Navaids/navdb.hxx>
 #include <Navaids/navlist.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
-#if defined(HAVE_PLIB_PSL)
-#include <Scripting/scriptmgr.hxx>
-#endif
+#include <Scripting/NasalSys.hxx>
 #include <Sound/fg_fx.hxx>
-#include <Sound/soundmgr.hxx>
+#include <Sound/beacon.hxx>
+#include <Sound/morse.hxx>
 #include <Systems/system_mgr.hxx>
-#include <Time/FGEventMgr.hxx>
 #include <Time/light.hxx>
-#include <Time/sunpos.hxx>
-#include <Time/moonpos.hxx>
+#include <Time/sunsolver.hxx>
 #include <Time/tmp.hxx>
+#include <Traffic/TrafficMgr.hxx>
 
 #ifdef FG_MPLAYER_AS
-#include <MultiPlayer/multiplaytxmgr.hxx>
-#include <MultiPlayer/multiplayrxmgr.hxx>
+#include <MultiPlayer/multiplaymgr.hxx>
 #endif
 
-#ifdef FG_WEATHERCM
-#  include <WeatherCM/FGLocalWeatherDatabase.h>
-#else
-#  include <Environment/environment_mgr.hxx>
-#endif
+#include <Environment/environment_mgr.hxx>
 
 #include "fg_init.hxx"
 #include "fg_io.hxx"
@@ -137,6 +126,7 @@
 #include "globals.hxx"
 #include "logger.hxx"
 #include "viewmgr.hxx"
+#include "main.hxx"
 
 #if defined(FX) && defined(XMESA)
 #include <GL/xmesa.h>
@@ -144,11 +134,10 @@
 
 SG_USING_STD(string);
 
-extern const char *default_root;
 
-#ifdef FG_USE_CLOUDS_3D
-  SkySceneLoader *sgCloud3d;
-#endif
+class Sound;
+extern const char *default_root;
+float init_volume;
 
 
 // Scan the command line options for the specified option and return
@@ -218,46 +207,68 @@ static string fgScanForOption( const string& option, const string& path ) {
     return "";
 }
 
+// Scan the user config files for the specified option and return
+// the value.
+static string fgScanForOption( const string& option ) {
+    string arg("");
 
-// Read in configuration (files and command line options) but only set
-// fg_root
-bool fgInitFGRoot ( int argc, char **argv ) {
-    string root;
-    char* envp;
-
-    // First parse command line options looking for --fg-root=, this
-    // will override anything specified in a config file
-    root = fgScanForOption( "--fg-root=", argc, argv);
+    if (hostname == NULL)
+    {
+        char _hostname[256];
+        gethostname(_hostname, 256);
+        hostname = strdup(_hostname);
+        free_hostname = true;
+    }
 
 #if defined( unix ) || defined( __CYGWIN__ )
     // Next check home directory for .fgfsrc.hostname file
-    if ( root.empty() ) {
-        envp = ::getenv( "HOME" );
-        if ( envp != NULL ) {
-            SGPath config( envp );
+    if ( arg.empty() ) {
+        if ( homedir != NULL ) {
+            SGPath config( homedir );
             config.append( ".fgfsrc" );
-            char name[256];
-            gethostname( name, 256 );
             config.concat( "." );
-            config.concat( name );
-            root = fgScanForOption( "--fg-root=", config.str() );
+            config.concat( hostname );
+            arg = fgScanForOption( option, config.str() );
         }
     }
 #endif
 
     // Next check home directory for .fgfsrc file
-    if ( root.empty() ) {
-        envp = ::getenv( "HOME" );
-        if ( envp != NULL ) {
-            SGPath config( envp );
+    if ( arg.empty() ) {
+        if ( homedir != NULL ) {
+            SGPath config( homedir );
             config.append( ".fgfsrc" );
-            root = fgScanForOption( "--fg-root=", config.str() );
+            arg = fgScanForOption( option, config.str() );
         }
     }
+
+    if ( arg.empty() ) {
+        // Check for $fg_root/system.fgfsrc
+        SGPath config( globals->get_fg_root() );
+        config.append( "system.fgfsrc" );
+        arg = fgScanForOption( option, config.str() );
+    }
+
+    return arg;
+}
+
+
+// Read in configuration (files and command line options) but only set
+// fg_root
+bool fgInitFGRoot ( int argc, char **argv ) {
+    string root;
+
+    // First parse command line options looking for --fg-root=, this
+    // will override anything specified in a config file
+    root = fgScanForOption( "--fg-root=", argc, argv);
+
+    // Check in one of the user configuration files.
+    if (root.empty() )
+        root = fgScanForOption( "--fg-root=" );
     
     // Next check if fg-root is set as an env variable
     if ( root.empty() ) {
-        envp = ::getenv( "FG_ROOT" );
+        char *envp = ::getenv( "FG_ROOT" );
         if ( envp != NULL ) {
             root = envp;
         }
@@ -270,8 +281,27 @@ bool fgInitFGRoot ( int argc, char **argv ) {
         root = "/FlightGear";
 #elif defined( WIN32 )
         root = "\\FlightGear";
-#elif defined( macintosh )
-        root = "";
+#elif defined(OSX_BUNDLE) 
+        /* the following code looks for the base package directly inside
+            the application bundle. This can be changed fairly easily by
+            fiddling with the code below. And yes, I know it's ugly and verbose.
+        */
+        CFBundleRef appBundle = CFBundleGetMainBundle();
+        CFURLRef appUrl = CFBundleCopyBundleURL(appBundle);
+        CFRelease(appBundle);
+
+        // look for a 'data' subdir directly inside the bundle : is there
+        // a better place? maybe in Resources? I don't know ...
+        CFURLRef dataDir = CFURLCreateCopyAppendingPathComponent(NULL, appUrl, CFSTR("data"), true);
+
+        // now convert down to a path, and the a c-string
+        CFStringRef path = CFURLCopyFileSystemPath(dataDir, kCFURLPOSIXPathStyle);
+        root = CFStringGetCStringPtr(path, CFStringGetSystemEncoding());
+
+        // tidy up.
+        CFRelease(appBundle);
+        CFRelease(dataDir);
+        CFRelease(path);
 #else
         root = PKGLIBDIR;
 #endif
@@ -288,37 +318,14 @@ bool fgInitFGRoot ( int argc, char **argv ) {
 // aircraft
 bool fgInitFGAircraft ( int argc, char **argv ) {
     string aircraft;
-    char* envp;
 
     // First parse command line options looking for --aircraft=, this
     // will override anything specified in a config file
     aircraft = fgScanForOption( "--aircraft=", argc, argv );
 
-#if defined( unix ) || defined( __CYGWIN__ )
-    // Next check home directory for .fgfsrc.hostname file
-    if ( aircraft.empty() ) {
-        envp = ::getenv( "HOME" );
-        if ( envp != NULL ) {
-            SGPath config( envp );
-            config.append( ".fgfsrc" );
-            char name[256];
-            gethostname( name, 256 );
-            config.concat( "." );
-            config.concat( name );
-            aircraft = fgScanForOption( "--aircraft=", config.str() );
-        }
-    }
-#endif
-
-    // Next check home directory for .fgfsrc file
-    if ( aircraft.empty() ) {
-        envp = ::getenv( "HOME" );
-        if ( envp != NULL ) {
-            SGPath config( envp );
-            config.append( ".fgfsrc" );
-            aircraft = fgScanForOption( "--aircraft=", config.str() );
-        }
-    }
+    // Check in one of the user configuration files.
+    if ( aircraft.empty() )
+        aircraft = fgScanForOption( "--aircraft=" );
 
     // if an aircraft was specified, set the property name
     if ( !aircraft.empty() ) {
@@ -480,27 +487,22 @@ do_options (int argc, char ** argv)
     fgParseOptions(config.str());
 
 #if defined( unix ) || defined( __CYGWIN__ )
-    char name[256];
-    // Check for $fg_root/system.fgfsrc.hostname
-    gethostname( name, 256 );
     config.concat( "." );
-    config.concat( name );
+    config.concat( hostname );
     fgParseOptions(config.str());
 #endif
 
     // Check for ~/.fgfsrc
-    char* envp = ::getenv( "HOME" );
-    if ( envp != NULL ) {
-        config.set( envp );
+    if ( homedir != NULL ) {
+        config.set( homedir );
         config.append( ".fgfsrc" );
         fgParseOptions(config.str());
     }
 
 #if defined( unix ) || defined( __CYGWIN__ )
     // Check for ~/.fgfsrc.hostname
-    gethostname( name, 256 );
     config.concat( "." );
-    config.concat( name );
+    config.concat( hostname );
     fgParseOptions(config.str());
 #endif
 
@@ -510,6 +512,38 @@ do_options (int argc, char ** argv)
 }
 
 
+static string fgFindAircraftPath( const SGPath &path, const string &aircraft ) {
+    ulDirEnt* dire;
+    ulDir *dirp = ulOpenDir(path.str().c_str());
+    if (dirp == NULL) {
+        cerr << "Unable to open aircraft directory '" << path.str() << '\'' << endl;
+        exit(-1);
+    }
+
+    while ((dire = ulReadDir(dirp)) != NULL) {
+        if (dire->d_isdir) {
+            if ( strcmp("CVS", dire->d_name) && strcmp(".", dire->d_name)
+                 && strcmp("..", dire->d_name) )
+            {
+                SGPath next = path;
+                next.append(dire->d_name);
+
+                string result = fgFindAircraftPath( next, aircraft );
+                if ( ! result.empty() ) {
+                    return result;
+                }
+            }
+        } else if ( !strcmp(dire->d_name, aircraft.c_str()) ) {
+            return path.str();
+        }
+    }
+
+    ulCloseDir(dirp);
+
+    return "";
+}
+
+
 // Read in configuration (file and command line)
 bool fgInitConfig ( int argc, char **argv ) {
 
@@ -529,24 +563,58 @@ bool fgInitConfig ( int argc, char **argv ) {
     // Scan user config files and command line for a specified aircraft.
     fgInitFGAircraft(argc, argv);
 
-    string aircraft = fgGetString("/sim/aircraft", "");
+    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);
+        SGPath aircraft_search( globals->get_fg_root() );
+        aircraft_search.append( "Aircraft" );
+
+        string aircraft_set = aircraft + "-set.xml";
+
+        string result = fgFindAircraftPath( aircraft_search, aircraft_set );
+        if ( !result.empty() ) {
+            fgSetString( "/sim/aircraft-dir", result.c_str() );
+            SGPath full_name( result );
+            full_name.append( aircraft_set );
+
+            SG_LOG(SG_INPUT, SG_INFO, "Reading default aircraft: " << aircraft
+                   << " from " << full_name.str());
+            try {
+                readProperties( full_name.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, "Cannot find specified aircraft: "
+                    << aircraft );
+            return false;
         }
+
     } else {
-        SG_LOG(SG_INPUT, SG_ALERT, "No default aircraft specified");
+        SG_LOG( SG_INPUT, SG_ALERT, "No default aircraft specified" );
+    }
+
+#ifdef _MSC_VER
+    char *envp = ::getenv( "APPDATA" );
+    if (envp != NULL ) {
+        SGPath config( envp );
+        config.append( "flightgear.org" );
+#else
+    if ( homedir != NULL ) {
+        SGPath config( homedir );
+        config.append( ".fgfs" );
+#endif
+        config.append( "preferences.xml" );
+        SG_LOG(SG_INPUT, SG_INFO, "Reading user preferences");
+        try {
+            fgLoadProps(config.str().c_str(), globals->get_props(), false,
+                        SGPropertyNode::USERARCHIVE);
+        } catch (...) {
+            SG_LOG(SG_INPUT, SG_BULK, "First time reading user preferences.");
+        }
+        SG_LOG(SG_INPUT, SG_BULK, "Finished Reading user preferences");
     }
 
     // parse options after loading aircraft to ensure any user
@@ -559,27 +627,27 @@ bool fgInitConfig ( int argc, char **argv ) {
 
 // find basic airport location info from airport database
 bool fgFindAirportID( const string& id, FGAirport *a ) {
+    const FGAirport* result;
     if ( id.length() ) {
-        SGPath path( globals->get_fg_root() );
-        path.append( "Airports" );
-        path.append( "simple.mk4" );
-        FGAirports airports( path.c_str() );
-
         SG_LOG( SG_GENERAL, SG_INFO, "Searching for airport code = " << id );
 
-        if ( ! airports.search( id, a ) ) {
+        result = globals->get_airports()->search( id );
+
+        if ( result == NULL ) {
             SG_LOG( SG_GENERAL, SG_ALERT,
-                    "Failed to find " << id << " in " << path.str() );
+                    "Failed to find " << id << " in apt.dat.gz" );
             return false;
         }
     } else {
         return false;
     }
 
+    *a = *result;
+
     SG_LOG( SG_GENERAL, SG_INFO,
             "Position for " << id << " is ("
-            << a->longitude << ", "
-            << a->latitude << ")" );
+            << a->getLongitude() << ", "
+            << a->getLatitude() << ")" );
 
     return true;
 }
@@ -594,13 +662,18 @@ static double fgGetAirportElev( const string& id ) {
             "Finding elevation for airport: " << id );
 
     if ( fgFindAirportID( id, &a ) ) {
-        return a.elevation;
+        return a.getElevation();
     } else {
         return -9999.0;
     }
 }
 
 
+#if 0 
+  // 
+  // This function is never used, but maybe useful in the future ???
+  //
+
 // Preset lon/lat given an airport id
 static bool fgSetPosFromAirportID( const string& id ) {
     FGAirport a;
@@ -628,6 +701,7 @@ static bool fgSetPosFromAirportID( const string& id ) {
         return false;
     }
 }
+#endif
 
 
 // Set current tower position lon/lat given an airport id
@@ -641,9 +715,9 @@ static bool fgSetTowerPosFromAirportID( const string& id, double hdg ) {
     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);
+        fgSetDouble("/sim/tower/longitude-deg",  a.getLongitude() + fudge_lon);
+        fgSetDouble("/sim/tower/latitude-deg",  a.getLatitude() + fudge_lat);
+        fgSetDouble("/sim/tower/altitude-ft", a.getElevation() + towerheight);
         return true;
     } else {
         return false;
@@ -651,6 +725,18 @@ static bool fgSetTowerPosFromAirportID( const string& id, double hdg ) {
 
 }
 
+struct FGTowerLocationListener : SGPropertyChangeListener {
+    void valueChanged(SGPropertyNode* node) {
+        const double hdg = fgGetDouble( "/orientation/heading-deg", 0);
+        const string id(node->getStringValue());
+        fgSetTowerPosFromAirportID(id, hdg);
+    }
+};
+
+static void fgInitTowerLocationListener() {
+    fgGetNode("/sim/tower/airport-id",  true)
+	->addChangeListener( new FGTowerLocationListener() );
+}
 
 // Set current_options lon/lat given an airport id and heading (degrees)
 static bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
@@ -659,16 +745,11 @@ static bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     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 airport code "
                 << id << " heading " << tgt_hdg );
 		
-        if ( ! runways.search( id, (int)tgt_hdg, &r ) ) {
+        if ( ! globals->get_runways()->search( id, (int)tgt_hdg, &r ) ) {
             SG_LOG( SG_GENERAL, SG_ALERT,
                     "Failed to find a good runway for " << id << '\n' );
             return false;
@@ -678,17 +759,17 @@ static bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     }
 
     double lat2, lon2, az2;
-    double heading = r.heading;
+    double heading = r._heading;
     double azimuth = heading + 180.0;
     while ( azimuth >= 360.0 ) { azimuth -= 360.0; }
 
     SG_LOG( SG_GENERAL, SG_INFO,
-            "runway =  " << r.lon << ", " << r.lat
-            << " length = " << r.length * SG_FEET_TO_METER 
+            "runway =  " << r._lon << ", " << r._lat
+            << " length = " << r._length * SG_FEET_TO_METER 
             << " heading = " << azimuth );
 	    
-    geo_direct_wgs_84 ( 0, r.lat, r.lon, azimuth, 
-                        r.length * SG_FEET_TO_METER * 0.5 - 5.0,
+    geo_direct_wgs_84 ( 0, r._lat, r._lon, azimuth, 
+                        r._length * SG_FEET_TO_METER * 0.5 - 5.0,
                         &lat2, &lon2, &az2 );
 
     if ( fabs( fgGetDouble("/sim/presets/offset-distance") ) > SG_EPSILON ) {
@@ -698,6 +779,7 @@ static bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
         double oaz = azimuth;
         if ( fabs(fgGetDouble("/sim/presets/offset-azimuth")) > SG_EPSILON ) {
             oaz = fgGetDouble("/sim/presets/offset-azimuth") + 180;
+            heading = tgt_hdg;
         }
         while ( oaz >= 360.0 ) { oaz -= 360.0; }
         geo_direct_wgs_84 ( 0, lat2, lon2, oaz, odist, &olat, &olon, &az2 );
@@ -732,16 +814,11 @@ static bool fgSetPosFromAirportIDandRwy( const string& id, const string& rwy ) {
     if ( id.length() ) {
         // set initial position from airport and runway number
 
-        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 for "
                 << id << ":" << rwy );
 
-        if ( ! runways.search( id, rwy, &r ) ) {
+        if ( ! globals->get_runways()->search( id, rwy, &r ) ) {
             SG_LOG( SG_GENERAL, SG_ALERT,
                     "Failed to find runway " << rwy << 
                     " at airport " << id );
@@ -752,18 +829,18 @@ static bool fgSetPosFromAirportIDandRwy( const string& id, const string& rwy ) {
     }
 
     double lat2, lon2, az2;
-    double heading = r.heading;
+    double heading = r._heading;
     double azimuth = heading + 180.0;
     while ( azimuth >= 360.0 ) { azimuth -= 360.0; }
     
     SG_LOG( SG_GENERAL, SG_INFO,
-    "runway =  " << r.lon << ", " << r.lat
-    << " length = " << r.length * SG_FEET_TO_METER 
+    "runway =  " << r._lon << ", " << r._lat
+    << " length = " << r._length * SG_FEET_TO_METER 
     << " heading = " << azimuth );
     
-    geo_direct_wgs_84 ( 0, r.lat, r.lon, 
+    geo_direct_wgs_84 ( 0, r._lat, r._lon, 
     azimuth,
-    r.length * SG_FEET_TO_METER * 0.5 - 5.0,
+    r._length * SG_FEET_TO_METER * 0.5 - 5.0,
     &lat2, &lon2, &az2 );
     
     if ( fabs( fgGetDouble("/sim/presets/offset-distance") ) > SG_EPSILON )
@@ -775,6 +852,7 @@ static bool fgSetPosFromAirportIDandRwy( const string& id, const string& rwy ) {
 	if ( fabs(fgGetDouble("/sim/presets/offset-azimuth")) > SG_EPSILON )
 	{
 	    oaz = fgGetDouble("/sim/presets/offset-azimuth") + 180;
+            heading = fgGetDouble("/sim/presets/heading-deg");
 	}
 	while ( oaz >= 360.0 ) { oaz -= 360.0; }
 	geo_direct_wgs_84 ( 0, lat2, lon2, oaz, odist, &olat, &olon, &az2 );
@@ -803,6 +881,7 @@ static bool fgSetPosFromAirportIDandRwy( const string& id, const string& rwy ) {
 
 
 static void fgSetDistOrAltFromGlideSlope() {
+    // cout << "fgSetDistOrAltFromGlideSlope()" << endl;
     string apt_id = fgGetString("/sim/presets/airport-id");
     double gs = fgGetDouble("/sim/presets/glideslope-deg")
         * SG_DEGREES_TO_RADIANS ;
@@ -842,12 +921,13 @@ static void fgSetDistOrAltFromGlideSlope() {
         fgSetDouble("/sim/presets/glideslope-deg", 0);
         fgSetBool("/sim/presets/onground", true);
     }                              
-}                       
+}
 
 
 // Set current_options lon/lat given an airport id and heading (degrees)
 static bool fgSetPosFromNAV( const string& id, const double& freq ) {
-    FGNav *nav = current_navlist->findByIdentAndFreq( id.c_str(), freq );
+    FGNavRecord *nav
+        = globals->get_navlist()->findByIdentAndFreq( id.c_str(), freq );
 
     // set initial position from runway and heading
     if ( nav != NULL ) {
@@ -893,13 +973,55 @@ static bool fgSetPosFromNAV( const string& id, const double& freq ) {
     }
 }
 
+// Set current_options lon/lat given an aircraft carrier id
+static bool fgSetPosFromCarrier( const string& carrier, const string& posid ) {
+
+    // set initial position from runway and heading
+    Point3D geodPos;
+    double heading;
+    sgdVec3 uvw;
+    if (FGAIManager::getStartPosition(carrier, posid, geodPos, heading, uvw)) {
+        double lon = geodPos.lon() * SGD_RADIANS_TO_DEGREES;
+        double lat = geodPos.lat() * SGD_RADIANS_TO_DEGREES;
+        double alt = geodPos.elev() * SG_METER_TO_FEET;
+
+        SG_LOG( SG_GENERAL, SG_INFO, "Attempting to set starting position for "
+                << carrier << " at lat = " << lat << ", lon = " << lon
+                << ", alt = " << alt << ", heading = " << heading);
+
+        fgSetDouble("/sim/presets/longitude-deg",  lon);
+        fgSetDouble("/sim/presets/latitude-deg",  lat);
+        fgSetDouble("/sim/presets/altitude-ft", alt);
+        fgSetDouble("/sim/presets/heading-deg", heading);
+        fgSetDouble("/position/longitude-deg",  lon);
+        fgSetDouble("/position/latitude-deg",  lat);
+        fgSetDouble("/position/altitude-ft", alt);
+        fgSetDouble("/orientation/heading-deg", heading);
+
+        fgSetString("/sim/presets/speed-set", "UVW");
+        fgSetDouble("/velocities/uBody-fps", uvw[0]);
+        fgSetDouble("/velocities/vBody-fps", uvw[1]);
+        fgSetDouble("/velocities/wBody-fps", uvw[2]);
+        fgSetDouble("/sim/presets/uBody-fps", uvw[0]);
+        fgSetDouble("/sim/presets/vBody-fps", uvw[1]);
+        fgSetDouble("/sim/presets/wBody-fps", uvw[2]);
 
+        fgSetBool("/sim/presets/onground", true);
+
+        return true;
+    } else {
+        SG_LOG( SG_GENERAL, SG_ALERT, "Failed to locate aircraft carrier = "
+                << carrier );
+        return false;
+    }
+}
+ 
 // Set current_options lon/lat given an airport id and heading (degrees)
 static bool fgSetPosFromFix( const string& id ) {
     FGFix fix;
 
     // set initial position from runway and heading
-    if ( current_fixlist->query( id.c_str(), &fix ) ) {
+    if ( globals->get_fixlist()->query( id.c_str(), &fix ) ) {
         SG_LOG( SG_GENERAL, SG_INFO, "Attempting to set starting position for "
                 << id );
 
@@ -941,35 +1063,93 @@ static bool fgSetPosFromFix( const string& id ) {
         return false;
     }
 }
+ 
+static void parseWaypoints() {
+    string_list *waypoints = globals->get_initial_waypoints();
+    if (waypoints) {
+	vector<string>::iterator i;
+	for (i = waypoints->begin(); 
+	     i  != waypoints->end();
+	     i++)
+        {
+            NewWaypoint(*i);
+        }
+	// Now were done using the way points we can deallocate the
+	// memory they used
+	while (waypoints->begin() != waypoints->end()) {
+            waypoints->pop_back();
+        }
+	delete waypoints;
+	globals->set_initial_waypoints(0);
+    }
+}
+
+ 
+ 
 
 
 /**
- * Initialize vor/ndb/ils/fix list management and query systems
+ * Initialize vor/ndb/ils/fix list management and query systems (as
+ * well as simple airport db list)
  */
 bool
 fgInitNav ()
 {
-    SG_LOG(SG_GENERAL, SG_INFO, "Loading Navaids");
-
-    SG_LOG(SG_GENERAL, SG_INFO, "  VOR/NDB");
-    current_navlist = new FGNavList;
-    SGPath p_nav( globals->get_fg_root() );
-    p_nav.append( "Navaids/default.nav" );
-    current_navlist->init( p_nav );
-
-    SG_LOG(SG_GENERAL, SG_INFO, "  ILS and Marker Beacons");
-    current_beacons = new FGMarkerBeacons;
-    current_beacons->init();
-    current_ilslist = new FGILSList;
-    SGPath p_ils( globals->get_fg_root() );
-    p_ils.append( "Navaids/default.ils" );
-    current_ilslist->init( p_ils );
+    SG_LOG(SG_GENERAL, SG_INFO, "Loading Airport Database ...");
+
+    SGPath aptdb( globals->get_fg_root() );
+    aptdb.append( "Airports/apt.dat" );
+
+    SGPath p_metar( globals->get_fg_root() );
+    p_metar.append( "Airports/metar.dat" );
+
+    FGAirportList *airports = new FGAirportList();
+    globals->set_airports( airports );
+    FGRunwayList *runways = new FGRunwayList();
+    globals->set_runways( runways );
+
+    fgAirportDBLoad( airports, runways, aptdb.str(), p_metar.str() );
+
+    FGNavList *navlist = new FGNavList;
+    FGNavList *loclist = new FGNavList;
+    FGNavList *gslist = new FGNavList;
+    FGNavList *dmelist = new FGNavList;
+    FGNavList *mkrlist = new FGNavList;
+    FGNavList *tacanlist = new FGNavList;
+    FGNavList *carrierlist = new FGNavList;
+    FGTACANList *channellist = new FGTACANList;
+
+    globals->set_navlist( navlist );
+    globals->set_loclist( loclist );
+    globals->set_gslist( gslist );
+    globals->set_dmelist( dmelist );
+    globals->set_mkrlist( mkrlist );
+    globals->set_tacanlist( tacanlist );
+    globals->set_carrierlist( carrierlist );
+    globals->set_channellist( channellist );
+
+    if ( !fgNavDBInit(airports, navlist, loclist, gslist, dmelist, mkrlist, tacanlist, carrierlist, channellist) ) {
+        SG_LOG( SG_GENERAL, SG_ALERT,
+                "Problems loading one or more navigational database" );
+    }
+
+    if ( fgGetBool("/sim/navdb/localizers/auto-align", true) ) {
+        // align all the localizers with their corresponding runways
+        // since data sources are good for cockpit navigation
+        // purposes, but not always to the error tolerances needed to
+        // exactly place these items.
+        double threshold
+            = fgGetDouble( "/sim/navdb/localizers/auto-align-threshold-deg",
+                           5.0 );
+        fgNavDBAlignLOCwithRunway( runways, loclist, threshold );
+    }
 
     SG_LOG(SG_GENERAL, SG_INFO, "  Fixes");
-    current_fixlist = new FGFixList;
     SGPath p_fix( globals->get_fg_root() );
-    p_fix.append( "Navaids/default.fix" );
-    current_fixlist->init( p_fix );
+    p_fix.append( "Navaids/fix.dat" );
+    FGFixList *fixlist = new FGFixList;
+    fixlist->init( p_fix );
+    globals->set_fixlist( fixlist );
 
     return true;
 }
@@ -977,16 +1157,21 @@ fgInitNav ()
 
 // Set the initial position based on presets (or defaults)
 bool fgInitPosition() {
-    bool set_pos = false;
+    // cout << "fgInitPosition()" << endl;
+    double gs = fgGetDouble("/sim/presets/glideslope-deg")
+        * SG_DEGREES_TO_RADIANS ;
+    double od = fgGetDouble("/sim/presets/offset-distance");
+    double alt = fgGetDouble("/sim/presets/altitude-ft");
 
-    // Default to starting on the ground unless one of the other
-    // conditions implies an in-air start.
-    fgSetBool("/sim/presets/onground", true);
+    bool set_pos = false;
 
     // If glideslope is specified, then calculate offset-distance or
     // altitude relative to glide slope if either of those was not
     // specified.
-    fgSetDistOrAltFromGlideSlope();
+    if ( fabs( gs ) > 0.01 ) {
+        fgSetDistOrAltFromGlideSlope();
+    }
+
 
     // If we have an explicit, in-range lon/lat, don't change it, just use it.
     // If not, check for an airport-id and use that.
@@ -1009,64 +1194,57 @@ bool fgInitPosition() {
     double vor_freq = fgGetDouble("/sim/presets/vor-freq");
     string ndb = fgGetString("/sim/presets/ndb-id");
     double ndb_freq = fgGetDouble("/sim/presets/ndb-freq");
+    string carrier = fgGetString("/sim/presets/carrier");
+    string parkpos = fgGetString("/sim/presets/parkpos");
     string fix = fgGetString("/sim/presets/fix");
+
+    fgSetDouble( "/orientation/heading-deg", hdg );
+    fgInitTowerLocationListener();
+
     if ( !set_pos && !apt.empty() && !rwy_no.empty() ) {
         // An airport + runway is requested
         if ( fgSetPosFromAirportIDandRwy( apt, rwy_no ) ) {
-            // set position (a little off the heading for single
+            // set tower position (a little off the heading for single
             // runway airports)
-            fgSetTowerPosFromAirportID( apt, hdg );
-
+	    fgSetString("/sim/tower/airport-id",  apt.c_str());
             set_pos = true;
         }
     }
+
     if ( !set_pos && !apt.empty() ) {
         // An airport is requested (find runway closest to hdg)
-        bool ok = false;
-        if (fgGetDouble("/sim/presets/altitude-ft") <= 0 &&
-            fgGetDouble("/sim/presets/offset-distance") == 0)
-            ok = fgSetPosFromAirportIDandHdg( apt, hdg );
-        else
-            ok = fgSetPosFromAirportID( apt );
-            
-        if (ok) {
-                // set position (a little off the heading for single
-                // runway airports)
-                fgSetTowerPosFromAirportID( apt, hdg );
-
+        if ( fgSetPosFromAirportIDandHdg( apt, hdg ) ) {
+            // set tower position (a little off the heading for single
+            // runway airports)
+	    fgSetString("/sim/tower/airport-id",  apt.c_str());
             set_pos = true;
         }
     }
+
     if ( !set_pos && !vor.empty() ) {
         // a VOR is requested
         if ( fgSetPosFromNAV( vor, vor_freq ) ) {
-            if ( fgGetDouble("/sim/presets/altitude-ft") > -9990.0 ) {
-                fgSetBool("/sim/presets/onground", false);
-            } else {
-                fgSetBool("/sim/presets/onground", true);
-            }
             set_pos = true;
         }
     }
+
     if ( !set_pos && !ndb.empty() ) {
         // an NDB is requested
         if ( fgSetPosFromNAV( ndb, ndb_freq ) ) {
-            if ( fgGetDouble("/sim/presets/altitude-ft") > -9990.0 ) {
-                fgSetBool("/sim/presets/onground", false);
-            } else {
-                fgSetBool("/sim/presets/onground", true);
-            }
             set_pos = true;
         }
     }
+
+    if ( !set_pos && !carrier.empty() ) {
+        // an aircraft carrier is requested
+        if ( fgSetPosFromCarrier( carrier, parkpos ) ) {
+            set_pos = true;
+        }
+    }
+
     if ( !set_pos && !fix.empty() ) {
         // a Fix is requested
         if ( fgSetPosFromFix( fix ) ) {
-            if ( fgGetDouble("/sim/presets/altitude-ft") > -9990.0 ) {
-                fgSetBool("/sim/presets/onground", false);
-            } else {
-                fgSetBool("/sim/presets/onground", true);
-            }
             set_pos = true;
         }
     }
@@ -1082,8 +1260,13 @@ bool fgInitPosition() {
                  fgGetDouble("/sim/presets/longitude-deg") );
     fgSetDouble( "/position/latitude-deg",
                  fgGetDouble("/sim/presets/latitude-deg") );
-    fgSetDouble( "/orientation/heading-deg",
-                 fgGetDouble("/sim/presets/heading-deg") );
+
+    // determine if this should be an on-ground or in-air start
+    if ((fabs(gs) > 0.01 || fabs(od) > 0.1 || alt > 0.1) && carrier.empty()) {
+        fgSetBool("/sim/presets/onground", false);
+    } else {
+        fgSetBool("/sim/presets/onground", true);
+    }                              
 
     return true;
 }
@@ -1141,16 +1324,19 @@ void fgInitFDM() {
     }
 
     double dt = 1.0 / fgGetInt("/sim/model-hz");
-    aircraft_dir = fgGetString("/sim/aircraft-dir");
-    const string &model = fgGetString("/sim/flight-model");
+    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 );
+#if ENABLE_SP_FDMS
         } else if ( model == "ada" ) {
             cur_fdm_state = new FGADA( dt );
+        } else if ( model == "acms" ) {
+            cur_fdm_state = new FGACMS( dt );
+#endif
         } else if ( model == "balloon" ) {
             cur_fdm_state = new FGBalloonSim( dt );
         } else if ( model == "magic" ) {
@@ -1195,8 +1381,22 @@ void fgInitFDM() {
             }
             cur_fdm_state = new FGExternalNet( dt, host, port1, port2, port3 );
         } else if ( model.find("pipe") == 0 ) {
-            string pipe_path = model.substr(5);
-            cur_fdm_state = new FGExternalPipe( dt, pipe_path );
+            // /* old */ string pipe_path = model.substr(5);
+            // /* old */ cur_fdm_state = new FGExternalPipe( dt, pipe_path );
+            string pipe_path = "";
+            string pipe_protocol = "";
+            string pipe_options = model.substr(5);
+            string::size_type begin, end;
+            begin = 0;
+            // pipe file path
+            end = pipe_options.find( ",", begin );
+            if ( end != string::npos ) {
+                pipe_path = pipe_options.substr(begin, end - begin);
+                begin = end + 1;
+            }
+            // protocol (last option)
+            pipe_protocol = pipe_options.substr(begin);
+            cur_fdm_state = new FGExternalPipe( dt, pipe_path, pipe_protocol );
         } else if ( model == "null" ) {
             cur_fdm_state = new FGNullFDM( dt );
         } else if ( model == "yasim" ) {
@@ -1255,45 +1455,115 @@ SGTime *fgInitTime() {
                             zone.str(),
                             cur_time_override->getLongValue() );
 
+    globals->set_warp_delta( 0 );
+
+    t->update( 0.0, 0.0,
+               cur_time_override->getLongValue(),
+               globals->get_warp() );
+
+    return t;
+}
+
+
+// set up a time offset (aka warp) if one is specified
+void fgInitTimeOffset() {
+    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);
+
     // Handle potential user specified time offsets
+    int orig_warp = globals->get_warp();
+    SGTime *t = globals->get_time_params();
     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
+    // Okay, we now have several 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 ); 
+    string offset_type = fgGetString("/sim/startup/time-offset-type");
+
+    int warp = 0;
+    if ( offset_type == "real" ) {
+        warp = 0;
+    } else if ( offset_type == "dawn" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           90.0, true ); 
+    } else if ( offset_type == "morning" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           75.0, true ); 
+    } else if ( offset_type == "noon" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           0.0, true ); 
+    } else if ( offset_type == "afternoon" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           60.0, false ); 
+     } else if ( offset_type == "dusk" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           90.0, false ); 
+     } else if ( offset_type == "evening" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           100.0, false ); 
+    } else if ( offset_type == "midnight" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           180.0, false ); 
+    } else if ( offset_type == "system-offset" ) {
+        warp = offset;
+    } else if ( offset_type == "gmt-offset" ) {
+        warp = offset - (currGMT - systemLocalTime);
+    } else if ( offset_type == "latitude-offset" ) {
+        warp = offset - (aircraftLocalTime - systemLocalTime);
+    } else if ( offset_type == "system" ) {
+        warp = offset - cur_time;
+    } else if ( offset_type == "gmt" ) {
+        warp = offset - currGMT;
+    } else if ( offset_type == "latitude" ) {
+        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,
+    globals->set_warp( orig_warp + warp );
+    t->update( longitude->getDoubleValue() * SGD_DEGREES_TO_RADIANS,
+               latitude->getDoubleValue() * SGD_DEGREES_TO_RADIANS,
                cur_time_override->getLongValue(),
                globals->get_warp() );
 
-    return t;
+    SG_LOG( SG_GENERAL, SG_INFO, "After fgInitTimeOffset(): warp = " 
+            << globals->get_warp() );
 }
 
 
@@ -1309,11 +1579,26 @@ bool fgInitSubsystems() {
     // static const SGPropertyNode *altitude
     //     = fgGetNode("/sim/presets/altitude-ft");
 
-    fgLIGHT *l = &cur_light_params;
-
     SG_LOG( SG_GENERAL, SG_INFO, "Initialize Subsystems");
     SG_LOG( SG_GENERAL, SG_INFO, "========== ==========");
 
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the event manager subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+    globals->get_event_mgr()->init();
+    globals->get_event_mgr()->setRealtimeProperty(fgGetNode("/sim/time/delta-realtime-sec", true));
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the property interpolator subsystem
+    ////////////////////////////////////////////////////////////////////
+    globals->add_subsystem("interpolator", new SGInterpolator);
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Add the FlightGear property utilities.
+    ////////////////////////////////////////////////////////////////////
+    globals->add_subsystem("properties", new FGProperties);
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the material property subsystem.
@@ -1321,22 +1606,12 @@ bool fgInitSubsystems() {
 
     SGPath mpath( globals->get_fg_root() );
     mpath.append( "materials.xml" );
-    if ( ! material_lib.load( mpath.str() ) ) {
+    string season = fgGetString("/sim/startup/season", "summer");
+    if ( ! globals->get_matlib()->load(globals->get_fg_root(), mpath.str(), season.c_str()) ) {
         SG_LOG( SG_GENERAL, SG_ALERT, "Error loading material lib!" );
         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.
@@ -1353,14 +1628,10 @@ bool fgInitSubsystems() {
     }
 
     // cause refresh of viewer scenery timestamps every 15 seconds...
-    global_events.Register( "FGTileMgr::refresh_view_timestamps()",
-                            globals->get_tile_mgr(),
-                            &FGTileMgr::refresh_view_timestamps,
-                            15000 );
-
-    SG_LOG( SG_GENERAL, SG_DEBUG,
-            "Current terrain elevation after tile mgr init " <<
-            globals->get_scenery()->get_cur_elev() );
+    globals->get_event_mgr()->addTask( "FGTileMgr::refresh_view_timestamps()",
+                                       globals->get_tile_mgr(),
+                                       &FGTileMgr::refresh_view_timestamps,
+                                       15 );
 
 
     ////////////////////////////////////////////////////////////////////
@@ -1375,36 +1646,18 @@ bool fgInitSubsystems() {
 
 
     ////////////////////////////////////////////////////////////////////
-    // Initialize the view manager subsystem.
+    // Initialize the XML Autopilot subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    fgInitView();
-
+    globals->add_subsystem( "xml-autopilot", new FGXMLAutopilot );
+    globals->add_subsystem( "route-manager", new FGRouteMgr );
 
+  
     ////////////////////////////////////////////////////////////////////
-    // Initialize the lighting subsystem.
+    // Initialize the view manager subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    // fgUpdateSunPos() needs a few position and view parameters set
-    // so it can calculate local relative sun angle and a few other
-    // things for correctly orienting the sky.
-    fgUpdateSunPos();
-    fgUpdateMoonPos();
-    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()",
-                            &cur_light_params, &fgLIGHT::Update,
-                            30000 );
-
+    fgInitView();
 
     ////////////////////////////////////////////////////////////////////
     // Create and register the logger.
@@ -1412,21 +1665,11 @@ bool fgInitSubsystems() {
     
     globals->add_subsystem("logger", new FGLogger);
 
-
-#if defined(HAVE_PLIB_PSL)
-    ////////////////////////////////////////////////////////////////////
-    // Create and register the script manager.
-    ////////////////////////////////////////////////////////////////////
-
-    globals->add_subsystem("scripting", new FGScriptMgr);
-#endif // HAVE_PLIB_PSL
-
-
     ////////////////////////////////////////////////////////////////////
     // Create and register the XML GUI.
     ////////////////////////////////////////////////////////////////////
 
-    globals->add_subsystem("gui", new NewGUI, FGSubsystemMgr::INIT);
+    globals->add_subsystem("gui", new NewGUI, SGSubsystemMgr::INIT);
 
 
     ////////////////////////////////////////////////////////////////////
@@ -1434,8 +1677,9 @@ bool fgInitSubsystems() {
     ////////////////////////////////////////////////////////////////////
 
     // update the current timezone each 30 minutes
-    global_events.Register( "fgUpdateLocalTime()", &fgUpdateLocalTime,
-                            30*60*1000 );
+    globals->get_event_mgr()->addTask( "fgUpdateLocalTime()",
+                                       &fgUpdateLocalTime, 30*60 );
+    fgInitTimeOffset();		// the environment subsystem needs this
 
 
     ////////////////////////////////////////////////////////////////////
@@ -1443,68 +1687,38 @@ bool fgInitSubsystems() {
     ////////////////////////////////////////////////////////////////////
 
     // Initialize the weather modeling subsystem
-#ifdef FG_WEATHERCM
-    // Initialize the WeatherDatabase
-    SG_LOG(SG_GENERAL, SG_INFO, "Creating LocalWeatherDatabase");
-    sgVec3 position;
-    sgSetVec3( position, current_aircraft.fdm_state->get_Latitude(),
-               current_aircraft.fdm_state->get_Longitude(),
-               current_aircraft.fdm_state->get_Altitude() * SG_FEET_TO_METER );
-    double init_vis = fgGetDouble("/environment/visibility-m");
-
-    FGLocalWeatherDatabase::DatabaseWorkingType working_type;
-
-    if (!strcmp(fgGetString("/environment/weather/working-type"), "internet"))
-    {
-      working_type = FGLocalWeatherDatabase::use_internet;
-    } else {
-      working_type = FGLocalWeatherDatabase::default_mode;
-    }
-    
-    if ( init_vis > 0 ) {
-      FGLocalWeatherDatabase::theFGLocalWeatherDatabase = 
-        new FGLocalWeatherDatabase( position,
-                                    globals->get_fg_root(),
-                                    working_type,
-                                    init_vis );
-    } else {
-      FGLocalWeatherDatabase::theFGLocalWeatherDatabase = 
-        new FGLocalWeatherDatabase( position,
-                                    globals->get_fg_root(),
-                                    working_type );
-    }
+    globals->add_subsystem("environment", new FGEnvironmentMgr);
 
-    // cout << theFGLocalWeatherDatabase << endl;
-    // cout << "visibility = " 
-    //      << theFGLocalWeatherDatabase->getWeatherVisibility() << endl;
 
-    WeatherDatabase = FGLocalWeatherDatabase::theFGLocalWeatherDatabase;
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the lighting subsystem.
+    ////////////////////////////////////////////////////////////////////
 
-    // register the periodic update of the weather
-    global_events.Register( "weather update", &fgUpdateWeatherDatabase,
-                            30000);
-#else
-    globals->get_environment_mgr()->init();
-    globals->get_environment_mgr()->bind();
-#endif
+    globals->add_subsystem("lighting", new FGLight);
 
-#ifdef FG_USE_CLOUDS_3D
+    //////////////////////////////////////////////////////////////////////
+    // Initialize the 2D cloud subsystem.
     ////////////////////////////////////////////////////////////////////
-    // Initialize the 3D cloud subsystem.
+    fgGetBool("/sim/rendering/bump-mapping", false);
+
+#ifdef ENABLE_AUDIO_SUPPORT
     ////////////////////////////////////////////////////////////////////
-    if ( fgGetBool("/sim/rendering/clouds3d") ) {
-        SGPath cloud_path(globals->get_fg_root());
-        cloud_path.append("large.sky");
-        SG_LOG(SG_GENERAL, SG_INFO, "Loading CLOUDS3d from: " << cloud_path.c_str());
-        if ( !sgCloud3d->Load( cloud_path.str(),
-                               latitude->getDoubleValue(),
-                               longitude->getDoubleValue()) )
-        {
-            fgSetBool("/sim/rendering/clouds3d", false);
-            SG_LOG(SG_GENERAL, SG_INFO, "CLOUDS3d FAILED: ");
-        }
-        SG_LOG(SG_GENERAL, SG_INFO, "CLOUDS3d Loaded: ");
-    }
+    // Initialize the sound subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+    init_volume = fgGetFloat("/sim/sound/volume");
+    fgSetFloat("/sim/sound/volume", 0.0f);
+    globals->set_soundmgr(new SGSoundMgr);
+    globals->get_soundmgr()->init();
+    globals->get_soundmgr()->bind();
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the sound-effects subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+    globals->add_subsystem("fx", new FGFX);
+    
 #endif
 
     ////////////////////////////////////////////////////////////////////
@@ -1531,41 +1745,34 @@ bool fgInitSubsystems() {
     globals->set_AI_mgr(new FGAIMgr);
     globals->get_AI_mgr()->init();
 
-
-#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.
+    // Initialise the AI Model Manager
     ////////////////////////////////////////////////////////////////////
-
-    globals->add_subsystem("fx", new FGFX);
-    
-#endif
+    SG_LOG(SG_GENERAL, SG_INFO, "  AI Model Manager");
+    globals->add_subsystem("ai_model", new FGAIManager);
+    globals->add_subsystem("submodel_mgr", new FGSubmodelMgr);
+
+
+     // It's probably a good idea to initialize the top level traffic manager
+     // After the AI and ATC systems have been initialized properly.
+     // AI Traffic manager
+     globals->add_subsystem("Traffic Manager", new FGTrafficManager);
+	     FGTrafficManager *dispatcher = 
+	     (FGTrafficManager*) globals->get_subsystem("Traffic Manager");
+	     SGPath path = globals->get_fg_root();
+	     path.append("/Traffic/fgtraffic.xml");
+     readXML(path.str(),
+	*dispatcher);
+	     //globals->get_subsystem("Traffic Manager")->init();
 
     globals->add_subsystem("instrumentation", new FGInstrumentMgr);
     globals->add_subsystem("systems", new FGSystemMgr);
 
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the radio stack subsystem.
-    ////////////////////////////////////////////////////////////////////
-
-    current_radiostack = new FGRadioStack;
-    current_radiostack->init();
-    current_radiostack->bind();
 
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the cockpit subsystem
     ////////////////////////////////////////////////////////////////////
-
     if( fgCockpitInit( &current_aircraft )) {
         // Cockpit initialized ok.
     } else {
@@ -1578,13 +1785,9 @@ bool fgInitSubsystems() {
     // Initialize the autopilot subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    globals->set_autopilot(new FGAutopilot);
-    globals->get_autopilot()->init();
-    globals->get_autopilot()->bind();
-
                                 // FIXME: these should go in the
                                 // GUI initialization code, not here.
-    fgAPAdjustInit();
+    // fgAPAdjustInit();
     NewTgtAirportInit();
     NewHeadingInit();
     NewAltitudeInit();
@@ -1615,13 +1818,6 @@ bool fgInitSubsystems() {
     }
 
     
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the default (kludged) properties.
-    ////////////////////////////////////////////////////////////////////
-
-    fgInitProps();
-
-
     ////////////////////////////////////////////////////////////////////
     // Initialize the controls subsystem.
     ////////////////////////////////////////////////////////////////////
@@ -1637,6 +1833,11 @@ bool fgInitSubsystems() {
     globals->add_subsystem("input", new FGInput);
 
 
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the replay subsystem
+    ////////////////////////////////////////////////////////////////////
+    globals->add_subsystem("replay", new FGReplay);
+
     ////////////////////////////////////////////////////////////////////
     // Bind and initialize subsystems.
     ////////////////////////////////////////////////////////////////////
@@ -1644,19 +1845,31 @@ bool fgInitSubsystems() {
     globals->get_subsystem_mgr()->bind();
     globals->get_subsystem_mgr()->init();
 
-
 #ifdef FG_MPLAYER_AS
     ////////////////////////////////////////////////////////////////////
     // Initialize multiplayer subsystem
     ////////////////////////////////////////////////////////////////////
 
-    globals->set_multiplayer_tx_mgr(new FGMultiplayTxMgr);
-    globals->get_multiplayer_tx_mgr()->init();
-
-    globals->set_multiplayer_rx_mgr(new FGMultiplayRxMgr);
-    globals->get_multiplayer_rx_mgr()->init();
+    globals->set_multiplayer_mgr(new FGMultiplayMgr);
+    globals->get_multiplayer_mgr()->init();
 #endif
 
+    ////////////////////////////////////////////////////////////////////////
+    // Initialize the Nasal interpreter.
+    // Do this last, so that the loaded scripts see initialized state
+    ////////////////////////////////////////////////////////////////////////
+    FGNasalSys* nasal = new FGNasalSys();
+    globals->add_subsystem("nasal", nasal);
+    nasal->init();
+
+    ////////////////////////////////////////////////////////////////////
+    // At this point we could try and parse the waypoint options
+    ///////////////////////////////////////////////////////////////////
+    parseWaypoints();
+
+    // initialize methods that depend on other subsystems.
+    globals->get_subsystem_mgr()->postinit();
+
     ////////////////////////////////////////////////////////////////////////
     // End of subsystem initialization.
     ////////////////////////////////////////////////////////////////////
@@ -1690,6 +1903,11 @@ void fgReInitSubsystems()
     if ( !freeze ) {
         fgSetBool("/sim/freeze/master", true);
     }
+    fgSetBool("/sim/crashed", false);
+
+    // Force reupdating the positions of the ai 3d models. They are used for
+    // initializing ground level for the FDM.
+    globals->get_subsystem("ai_model")->reinit();
 
     // Initialize the FDM
     fgInitFDM();
@@ -1704,15 +1922,15 @@ void fgReInitSubsystems()
     fgInitView();
 
     globals->get_controls()->reset_all();
-    globals->get_autopilot()->reset();
 
-    fgUpdateSunPos();
-    fgUpdateMoonPos();
-    cur_light_params.Update();
     fgUpdateLocalTime();
 
+    // re-init to proper time of day setting
+    fgInitTimeOffset();
+
     if ( !freeze ) {
         fgSetBool("/sim/freeze/master", false);
     }
+    fgSetBool("/sim/sceneryloaded",false);
 }