X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FMain%2Ffg_init.cxx;h=15681791f561346fbe550acaaf0724a00d56f076;hb=b3e969726249e772da4c9d1aa6eb212e6472aed3;hp=8314d7bbdce987ac655ecc3383e3be92c32954c7;hpb=470d233f0d603b7db2b4ce243342db3a0de1a207;p=flightgear.git

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 8314d7bbd..15681791f 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -31,12 +31,6 @@
 #  include <math.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
-#include <GL/glut.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>             // strcmp()
@@ -53,18 +47,24 @@
 #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>
-#include <simgear/sky/clouds3d/SkySceneLoader.hpp>
-#include <simgear/sky/clouds3d/SkyUtil.hpp>
+#include <simgear/misc/interpolator.hxx>
+#include <simgear/scene/material/matlib.hxx>
+#ifdef FG_USE_CLOUDS_3D
+#  include <simgear/scene/sky/clouds3d/SkySceneLoader.hpp>
+#  include <simgear/scene/sky/clouds3d/SkyUtil.hpp>
+#  include <simgear/screen/texture.hxx>
+#endif
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/timing/lowleveltime.h>
 
@@ -74,53 +74,52 @@
 #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 <Autopilot/route_mgr.hxx>
+#include <Autopilot/xmlauto.hxx>
 #include <Cockpit/cockpit.hxx>
 #include <Cockpit/radiostack.hxx>
-#include <Cockpit/steam.hxx>
 #include <Cockpit/panel.hxx>
 #include <Cockpit/panel_io.hxx>
 #include <FDM/ADA.hxx>
 #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>
 #include <FDM/YASim/YASim.hxx>
+#include <GUI/new_gui.hxx>
 #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/AIManager.hxx>
+#include <Navaids/navdb.hxx>
 #include <Navaids/navlist.hxx>
+#include <Replay/replay.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
+#include <Scripting/NasalSys.hxx>
 #include <Sound/fg_fx.hxx>
-#include <Sound/soundmgr.hxx>
 #include <Systems/system_mgr.hxx>
-#include <Time/FGEventMgr.hxx>
 #include <Time/light.hxx>
-#include <Time/sunpos.hxx>
 #include <Time/moonpos.hxx>
+#include <Time/sunpos.hxx>
+#include <Time/sunsolver.hxx>
 #include <Time/tmp.hxx>
+#include <Traffic/TrafficMgr.hxx>
 
-#ifdef FG_WEATHERCM
-#  include <WeatherCM/FGLocalWeatherDatabase.h>
-#else
-#  include <Environment/environment_mgr.hxx>
+#ifdef FG_MPLAYER_AS
+#include <MultiPlayer/multiplaytxmgr.hxx>
+#include <MultiPlayer/multiplayrxmgr.hxx>
 #endif
 
+#include <Environment/environment_mgr.hxx>
+
 #include "fg_init.hxx"
 #include "fg_io.hxx"
 #include "fg_commands.hxx"
@@ -136,18 +135,94 @@
 
 SG_USING_STD(string);
 
+
+class Sound;
+
 extern const char *default_root;
 
-SkySceneLoader *sgCloud3d;
 
-// Read in configuration (file and command line) and just set fg_root
+#ifdef FG_USE_CLOUDS_3D
+  SkySceneLoader *sgCloud3d;
+#endif
+
+
+// Scan the command line options for the specified option and return
+// the value.
+static string fgScanForOption( const string& option, int argc, char **argv ) {
+    int i = 1;
+
+    SG_LOG(SG_GENERAL, SG_INFO, "Scanning command line for: " << option );
+
+    int len = option.length();
+
+    while ( i < argc ) {
+	SG_LOG( SG_GENERAL, SG_DEBUG, "argv[" << i << "] = " << argv[i] );
+
+	string arg = argv[i];
+	if ( arg.find( option ) == 0 ) {
+	    return arg.substr( len );
+	}
+
+	i++;
+    }
+
+    return "";
+}
+
+
+// Scan the user config files for the specified option and return
+// the value.
+static string fgScanForOption( const string& option, const string& path ) {
+    sg_gzifstream in( path );
+    if ( !in.is_open() ) {
+        return "";
+    }
+
+    SG_LOG( SG_GENERAL, SG_INFO, "Scanning " << path << " for: " << option );
+
+    int len = option.length();
+
+    in >> skipcomment;
+#ifndef __MWERKS__
+    while ( ! in.eof() ) {
+#else
+    char c = '\0';
+    while ( in.get(c) && c != '\0' ) {
+	in.putback(c);
+#endif
+	string line;
+
+#if defined( macintosh )
+        getline( in, line, '\r' );
+#else
+	getline( in, line, '\n' );
+#endif
+
+        // catch extraneous (DOS) line ending character
+        if ( line[line.length() - 1] < 32 ) {
+            line = line.substr( 0, line.length()-1 );
+        }
+
+	if ( line.find( option ) == 0 ) {
+	    return line.substr( len );
+	}
+
+	in >> skipcomment;
+    }
+
+    return "";
+}
+
+
+// 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 = fgScanForRoot(argc, argv);
+    // 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 defined( unix ) || defined( __CYGWIN__ )
     // Next check home directory for .fgfsrc.hostname file
@@ -160,7 +235,7 @@ bool fgInitFGRoot ( int argc, char **argv ) {
             gethostname( name, 256 );
             config.concat( "." );
             config.concat( name );
-            root = fgScanForRoot(config.str());
+            root = fgScanForOption( "--fg-root=", config.str() );
         }
     }
 #endif
@@ -171,7 +246,7 @@ bool fgInitFGRoot ( int argc, char **argv ) {
         if ( envp != NULL ) {
             SGPath config( envp );
             config.append( ".fgfsrc" );
-            root = fgScanForRoot(config.str());
+            root = fgScanForOption( "--fg-root=", config.str() );
         }
     }
     
@@ -190,8 +265,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
@@ -204,6 +298,54 @@ bool fgInitFGRoot ( int argc, char **argv ) {
 }
 
 
+// Read in configuration (files and command line options) but only set
+// 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() );
+        }
+    }
+
+    // if an aircraft was specified, set the property name
+    if ( !aircraft.empty() ) {
+        SG_LOG(SG_INPUT, SG_INFO, "aircraft = " << aircraft );
+        fgSetString("/sim/aircraft", aircraft.c_str() );
+    } else {
+        SG_LOG(SG_INPUT, SG_INFO, "No user specified aircraft, using default" );
+    }
+
+    return true;
+}
+
+
 // Return the current base package version
 string fgBasePackageVersion() {
     SGPath base_path( globals->get_fg_root() );
@@ -330,8 +472,8 @@ bool fgDetectLanguage() {
 
     SGPropertyNode *locale = fgInitLocale(language);
     if (!locale) {
-       cerr << "No internationalization settings specified in preferences.xml"
-            << endl;
+       SG_LOG(SG_GENERAL, SG_ALERT,
+              "No internationalization settings specified in preferences.xml" );
 
        return false;
     }
@@ -341,48 +483,11 @@ bool fgDetectLanguage() {
     return true;
 }
 
-
-// Read in configuration (file and command line)
-bool fgInitConfig ( int argc, char **argv ) {
-
-                                // First, set some sane default values
-    fgSetDefaults();
-
-    // Read global preferences from $FG_ROOT/preferences.xml
-    SGPath props_path(globals->get_fg_root());
-    props_path.append("preferences.xml");
-    SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences");
-    readProperties(props_path.str(), globals->get_props());
-    SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
-
-    // Detect the required language as early as possible
-    if (fgDetectLanguage() != true)
-       return false;
-
-    // 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
-
+// Attempt to locate and parse the various non-XML config files in order
+// from least precidence to greatest precidence
+static void
+do_options (int argc, char ** argv)
+{
     // Check for $fg_root/system.fgfsrc
     SGPath config( globals->get_fg_root() );
     config.append( "system.fgfsrc" );
@@ -416,6 +521,96 @@ bool fgInitConfig ( int argc, char **argv ) {
     // Parse remaining command line options
     // These will override anything specified in a config file
     fgParseArgs(argc, 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." << 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 ) {
+
+    // First, set some sane default values
+    fgSetDefaults();
+
+    // Read global preferences from $FG_ROOT/preferences.xml
+    SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences");
+    fgLoadProps("preferences.xml", globals->get_props());
+    SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
+
+    // Detect the required language as early as possible
+    if ( !fgDetectLanguage() ) {
+        return false;
+    }
+
+    // Scan user config files and command line for a specified aircraft.
+    fgInitFGAircraft(argc, argv);
+
+    string aircraft = fgGetString( "/sim/aircraft", "" );
+    if ( aircraft.size() > 0 ) {
+        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" );
+    }
+
+    // parse options after loading aircraft to ensure any user
+    // overrides of defaults are honored.
+    do_options(argc, argv);
 
     return true;
 }
@@ -423,23 +618,23 @@ bool fgInitConfig ( int argc, char **argv ) {
 
 // find basic airport location info from airport database
 bool fgFindAirportID( const string& id, FGAirport *a ) {
+    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.id.empty() ) {
             SG_LOG( SG_GENERAL, SG_ALERT,
-                    "Failed to find " << id << " in " << path.str() );
+                    "Failed to find " << id << " in basic.dat.gz" );
             return false;
         }
     } else {
         return false;
     }
 
+    *a = result;
+
     SG_LOG( SG_GENERAL, SG_INFO,
             "Position for " << id << " is ("
             << a->longitude << ", "
@@ -449,8 +644,29 @@ bool fgFindAirportID( const string& id, FGAirport *a ) {
 }
 
 
-// Set current_options lon/lat given an airport id
-bool fgSetPosFromAirportID( const string& id ) {
+// get airport elevation
+static double fgGetAirportElev( const string& id ) {
+    FGAirport a;
+    // double lon, lat;
+
+    SG_LOG( SG_GENERAL, SG_INFO,
+            "Finding elevation for airport: " << id );
+
+    if ( fgFindAirportID( id, &a ) ) {
+        return a.elevation;
+    } 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;
     // double lon, lat;
 
@@ -458,24 +674,29 @@ bool fgSetPosFromAirportID( const string& id ) {
             "Attempting to set starting position from airport code " << id );
 
     if ( fgFindAirportID( id, &a ) ) {
-        fgSetDouble("/position/longitude-deg",  a.longitude );
-        fgSetDouble("/position/latitude-deg",  a.latitude );
+        // presets
+        fgSetDouble("/sim/presets/longitude-deg", a.longitude );
+        fgSetDouble("/sim/presets/latitude-deg", a.latitude );
+
+        // other code depends on the actual postition being set so set
+        // that as well
+        fgSetDouble("/position/longitude-deg", a.longitude );
+        fgSetDouble("/position/latitude-deg", a.latitude );
+
         SG_LOG( SG_GENERAL, SG_INFO,
-                "Position for " << id << " is ("
-                << a.longitude << ", "
-                << a.latitude << ")" );
+                "Position for " << id << " is (" << a.longitude
+                << ", " << a.latitude << ")" );
 
         return true;
     } else {
         return false;
     }
-
 }
-
+#endif
 
 
 // Set current tower position lon/lat given an airport id
-bool fgSetTowerPosFromAirportID( const string& id, double hdg ) {
+static bool fgSetTowerPosFromAirportID( const string& id, double hdg ) {
     FGAirport a;
     // tower height hard coded for now...
     float towerheight=50.0f;
@@ -497,112 +718,60 @@ bool fgSetTowerPosFromAirportID( const string& id, double hdg ) {
 
 
 // Set current_options lon/lat given an airport id and heading (degrees)
-bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
+static bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     FGRunway r;
-    FGRunway found_r;
-    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 "
+                "Attempting to set starting position from airport 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 ) ) {
+		
+        if ( ! globals->get_runways()->search( id, (int)tgt_hdg, &r ) ) {
             SG_LOG( SG_GENERAL, SG_ALERT,
-                    "Failed to find " << id << " in database." );
+                    "Failed to find a good runway for " << id << '\n' );
             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;
     }
 
-    double heading = found_r.heading + found_dir;
-    while ( heading >= 360.0 ) { heading -= 360.0; }
-
     double lat2, lon2, az2;
-    double azimuth = found_r.heading + found_dir + 180.0;
+    double heading = r.heading;
+    double azimuth = heading + 180.0;
     while ( azimuth >= 360.0 ) { azimuth -= 360.0; }
 
     SG_LOG( SG_GENERAL, SG_INFO,
-            "runway =  " << found_r.lon << ", " << found_r.lat
-            << " length = " << found_r.length * SG_FEET_TO_METER * 0.5 
+            "runway =  " << r.lon << ", " << r.lat
+            << " length = " << r.length * SG_FEET_TO_METER 
             << " heading = " << azimuth );
-    
-    geo_direct_wgs_84 ( 0, found_r.lat, found_r.lon, 
-                        azimuth, found_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/startup/offset-distance") ) > SG_EPSILON ) {
+    if ( fabs( fgGetDouble("/sim/presets/offset-distance") ) > SG_EPSILON ) {
         double olat, olon;
-        double odist = fgGetDouble("/sim/startup/offset-distance");
+        double odist = fgGetDouble("/sim/presets/offset-distance");
         odist *= SG_NM_TO_METER;
         double oaz = azimuth;
-        if ( fabs(fgGetDouble("/sim/startup/offset-azimuth")) > SG_EPSILON ) {
-            oaz = fgGetDouble("/sim/startup/offset-azimuth") + 180;
+        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 );
         lat2=olat;
         lon2=olon;
     }
-        
+
+    // presets
+    fgSetDouble("/sim/presets/longitude-deg",  lon2 );
+    fgSetDouble("/sim/presets/latitude-deg",  lat2 );
+    fgSetDouble("/sim/presets/heading-deg", heading );
+
+    // other code depends on the actual values being set ...
     fgSetDouble("/position/longitude-deg",  lon2 );
     fgSetDouble("/position/latitude-deg",  lat2 );
     fgSetDouble("/orientation/heading-deg", heading );
@@ -612,41 +781,419 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
             << lon2 << ", "
             << lat2 << ") new heading is "
             << heading );
-
+	    
     return true;
 }
 
 
-void fgSetPosFromGlideSlope(void) {
-    double gs = fgGetDouble("/velocities/glideslope");
-    double od = fgGetDouble("/sim/startup/offset-distance");
-    double alt = fgGetDouble("/position/altitude-ft");
+// Set current_options lon/lat given an airport id and runway number
+static bool fgSetPosFromAirportIDandRwy( const string& id, const string& rwy ) {
+    FGRunway r;
+
+    if ( id.length() ) {
+        // set initial position from airport and runway number
+
+        SG_LOG( SG_GENERAL, SG_INFO,
+                "Attempting to set starting position for "
+                << id << ":" << rwy );
+
+        if ( ! globals->get_runways()->search( id, rwy, &r ) ) {
+            SG_LOG( SG_GENERAL, SG_ALERT,
+                    "Failed to find runway " << rwy << 
+                    " at airport " << id );
+            return false;
+        }
+    } else {
+        return false;
+    }
+
+    double lat2, lon2, az2;
+    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 
+    << " heading = " << azimuth );
     
-    //if glideslope and offset-distance are set and altitude is
-    //not, calculate the initial altitude
+    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 )
+    {
+	double olat, olon;
+	double odist = fgGetDouble("/sim/presets/offset-distance");
+	odist *= SG_NM_TO_METER;
+	double oaz = azimuth;
+	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 );
+	lat2=olat;
+	lon2=olon;
+    }
+    
+    // presets
+    fgSetDouble("/sim/presets/longitude-deg",  lon2 );
+    fgSetDouble("/sim/presets/latitude-deg",  lat2 );
+    fgSetDouble("/sim/presets/heading-deg", heading );
+    
+    // other code depends on the actual values being set ...
+    fgSetDouble("/position/longitude-deg",  lon2 );
+    fgSetDouble("/position/latitude-deg",  lat2 );
+    fgSetDouble("/orientation/heading-deg", heading );
+    
+    SG_LOG( SG_GENERAL, SG_INFO,
+    "Position for " << id << " is ("
+    << lon2 << ", "
+    << lat2 << ") new heading is "
+    << heading );
+    
+    return true;
+}
+
+
+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 ;
+    double od = fgGetDouble("/sim/presets/offset-distance");
+    double alt = fgGetDouble("/sim/presets/altitude-ft");
+
+    double apt_elev = 0.0;
+    if ( ! apt_id.empty() ) {
+        apt_elev = fgGetAirportElev( apt_id );
+        if ( apt_elev < -9990.0 ) {
+            apt_elev = 0.0;
+        }
+    } else {
+        apt_elev = 0.0;
+    }
+
     if( fabs(gs) > 0.01 && fabs(od) > 0.1 && alt < -9990 ) {
+        // set altitude from glideslope and offset-distance
         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");
+        alt = fabs(od*tan(gs)) + apt_elev;
+        fgSetDouble("/sim/presets/altitude-ft", alt);
+        fgSetBool("/sim/presets/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);
+        // set offset-distance from glideslope and altitude
+        od  = (alt - apt_elev) / 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");
+        fgSetDouble("/sim/presets/offset-distance", od);
+        fgSetBool("/sim/presets/onground", false);
+        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);                                  
+        SG_LOG( SG_GENERAL, SG_ALERT,
+                "Glideslope given but not altitude or offset-distance." );
+        SG_LOG( SG_GENERAL, SG_ALERT, "Resetting glideslope to zero" );
+        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 ) {
+    FGNavRecord *nav
+        = globals->get_navlist()->findByIdentAndFreq( id.c_str(), freq );
+
+    // set initial position from runway and heading
+    if ( nav != NULL ) {
+        SG_LOG( SG_GENERAL, SG_INFO, "Attempting to set starting position for "
+                << id << ":" << freq );
+
+        double lon = nav->get_lon();
+        double lat = nav->get_lat();
+
+        if ( fabs( fgGetDouble("/sim/presets/offset-distance") ) > SG_EPSILON )
+        {
+            double odist = fgGetDouble("/sim/presets/offset-distance")
+                * SG_NM_TO_METER;
+            double oaz = fabs(fgGetDouble("/sim/presets/offset-azimuth"))
+                + 180.0;
+            while ( oaz >= 360.0 ) { oaz -= 360.0; }
+            double olat, olon, az2;
+            geo_direct_wgs_84 ( 0, lat, lon, oaz, odist, &olat, &olon, &az2 );
+
+            lat = olat;
+            lon = olon;
+        }
+
+        // presets
+        fgSetDouble("/sim/presets/longitude-deg",  lon );
+        fgSetDouble("/sim/presets/latitude-deg",  lat );
+
+        // other code depends on the actual values being set ...
+        fgSetDouble("/position/longitude-deg",  lon );
+        fgSetDouble("/position/latitude-deg",  lat );
+        fgSetDouble("/orientation/heading-deg", 
+                    fgGetDouble("/sim/presets/heading-deg") );
+
+        SG_LOG( SG_GENERAL, SG_INFO,
+                "Position for " << id << ":" << freq << " is ("
+                << lon << ", "<< lat << ")" );
+
+        return true;
+    } else {
+        SG_LOG( SG_GENERAL, SG_ALERT, "Failed to locate NAV = "
+                << id << ":" << freq );
+        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 ( globals->get_fixlist()->query( id.c_str(), &fix ) ) {
+        SG_LOG( SG_GENERAL, SG_INFO, "Attempting to set starting position for "
+                << id );
+
+        double lon = fix.get_lon();
+        double lat = fix.get_lat();
+
+        if ( fabs( fgGetDouble("/sim/presets/offset-distance") ) > SG_EPSILON )
+        {
+            double odist = fgGetDouble("/sim/presets/offset-distance")
+                * SG_NM_TO_METER;
+            double oaz = fabs(fgGetDouble("/sim/presets/offset-azimuth"))
+                + 180.0;
+            while ( oaz >= 360.0 ) { oaz -= 360.0; }
+            double olat, olon, az2;
+            geo_direct_wgs_84 ( 0, lat, lon, oaz, odist, &olat, &olon, &az2 );
+
+            lat = olat;
+            lon = olon;
+        }
+
+        // presets
+        fgSetDouble("/sim/presets/longitude-deg",  lon );
+        fgSetDouble("/sim/presets/latitude-deg",  lat );
+
+        // other code depends on the actual values being set ...
+        fgSetDouble("/position/longitude-deg",  lon );
+        fgSetDouble("/position/latitude-deg",  lat );
+        fgSetDouble("/orientation/heading-deg", 
+                    fgGetDouble("/sim/presets/heading-deg") );
+
+        SG_LOG( SG_GENERAL, SG_INFO,
+                "Position for " << id << " is ("
+                << lon << ", "<< lat << ")" );
+
+        return true;
+    } else {
+        SG_LOG( SG_GENERAL, SG_ALERT, "Failed to locate NAV = "
+                << 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 (as
+ * well as simple airport db list)
+ */
+bool
+fgInitNav ()
+{
+    SG_LOG(SG_GENERAL, SG_INFO, "Loading Simple Airport List");
+    SGPath p_simple( globals->get_fg_root() );
+    p_simple.append( "Airports/basic.dat" );
+    SGPath p_metar( globals->get_fg_root() );
+    p_metar.append( "Airports/metar.dat" );
+    FGAirportList *airports = new FGAirportList(p_simple.str(), p_metar.str());
+    globals->set_airports( airports );
+
+    SG_LOG(SG_GENERAL, SG_INFO, "Loading Runway List");
+    SGPath p_runway( globals->get_fg_root() );
+    p_runway.append( "Airports/runways.dat" );
+    FGRunwayList *runways = new FGRunwayList( p_runway.str() );
+    globals->set_runways( runways );
+
+    FGNavList *navlist = new FGNavList;
+    FGNavList *loclist = new FGNavList;
+    FGNavList *gslist = new FGNavList;
+    FGNavList *dmelist = new FGNavList;
+    FGNavList *mkrlist = new FGNavList;
+
+    globals->set_navlist( navlist );
+    globals->set_loclist( loclist );
+    globals->set_gslist( gslist );
+    globals->set_dmelist( dmelist );
+    globals->set_mkrlist( mkrlist );
+
+    if ( !fgNavDBInit( navlist, loclist, gslist, dmelist, mkrlist ) ) {
+        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");
+    SGPath p_fix( globals->get_fg_root() );
+    p_fix.append( "Navaids/fix.dat" );
+    FGFixList *fixlist = new FGFixList;
+    fixlist->init( p_fix );
+    globals->set_fixlist( fixlist );
+
+    return true;
+}
+
+
+// Set the initial position based on presets (or defaults)
+bool fgInitPosition() {
+    // 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");
+
+    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.
+    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.
+    // If not, default to the middle of the KSFO field.
+    // The default values for lon/lat are deliberately out of range
+    // so that the airport-id can take effect; valid lon/lat will
+    // override airport-id, however.
+    double lon_deg = fgGetDouble("/sim/presets/longitude-deg");
+    double lat_deg = fgGetDouble("/sim/presets/latitude-deg");
+    if ( lon_deg >= -180.0 && lon_deg <= 180.0
+         && lat_deg >= -90.0 && lat_deg <= 90.0 )
+    {
+        set_pos = true;
+    }
+
+    string apt = fgGetString("/sim/presets/airport-id");
+    string rwy_no = fgGetString("/sim/presets/runway");
+    double hdg = fgGetDouble("/sim/presets/heading-deg");
+    string vor = fgGetString("/sim/presets/vor-id");
+    double vor_freq = fgGetDouble("/sim/presets/vor-freq");
+    string ndb = fgGetString("/sim/presets/ndb-id");
+    double ndb_freq = fgGetDouble("/sim/presets/ndb-freq");
+    string fix = fgGetString("/sim/presets/fix");
+
+    if ( !set_pos && !apt.empty() && !rwy_no.empty() ) {
+        // An airport + runway is requested
+        if ( fgSetPosFromAirportIDandRwy( apt, rwy_no ) ) {
+            // set tower position (a little off the heading for single
+            // runway airports)
+            fgSetTowerPosFromAirportID( apt, hdg );
+            set_pos = true;
+        }
+    }
+
+    if ( !set_pos && !apt.empty() ) {
+        // An airport is requested (find runway closest to hdg)
+        if ( fgSetPosFromAirportIDandHdg( apt, hdg ) ) {
+            // set tower position (a little off the heading for single
+            // runway airports)
+            fgSetTowerPosFromAirportID( apt, hdg );
+            set_pos = true;
+        }
+    }
+
+    if ( !set_pos && !vor.empty() ) {
+        // a VOR is requested
+        if ( fgSetPosFromNAV( vor, vor_freq ) ) {
+            set_pos = true;
+        }
+    }
+
+    if ( !set_pos && !ndb.empty() ) {
+        // an NDB is requested
+        if ( fgSetPosFromNAV( ndb, ndb_freq ) ) {
+            set_pos = true;
+        }
+    }
+
+    if ( !set_pos && !fix.empty() ) {
+        // a Fix is requested
+        if ( fgSetPosFromFix( fix ) ) {
+            set_pos = true;
+        }
+    }
+
+    if ( !set_pos ) {
+        // No lon/lat specified, no airport specified, default to
+        // middle of KSFO field.
+        fgSetDouble("/sim/presets/longitude-deg", -122.374843);
+        fgSetDouble("/sim/presets/latitude-deg", 37.619002);
+    }
+
+    fgSetDouble( "/position/longitude-deg",
+                 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 ) {
+        fgSetBool("/sim/presets/onground", false);
+    } else {
+        fgSetBool("/sim/presets/onground", true);
     }                              
-                                      
-}                       
+
+    return true;
+}
+
 
 // General house keeping initializations
-bool fgInitGeneral( void ) {
+bool fgInitGeneral() {
     string root;
 
 #if defined(FX) && defined(XMESA)
@@ -750,6 +1297,9 @@ void fgInitFDM() {
                 begin = end + 1;
             }
             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 );
         } else if ( model == "null" ) {
             cur_fdm_state = new FGNullFDM( dt );
         } else if ( model == "yasim" ) {
@@ -769,11 +1319,11 @@ void fgInitFDM() {
 static void printMat(const sgVec4 *mat, char *name="")
 {
     int i;
-    cout << name << endl;
+    SG_LOG(SG_GENERAL, SG_BULK, name );
     for(i=0; i<4; i++) {
-        cout <<"  "<<mat[i][0]<<" "<<mat[i][1]<<" "<<mat[i][2]<<" "<<mat[i][3]<<endl;
+        SG_LOG(SG_GENERAL, SG_BULK, "  " << mat[i][0] << " " << mat[i][1]
+                                    << " " << mat[i][2] << " " << mat[i][3] );
     }
-    cout << endl;
 }
 
 // Initialize view parameters
@@ -808,65 +1358,149 @@ 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 ); 
+
+    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() );
 }
 
-
 // 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;
+bool fgInitSubsystems() {
+    // static const SGPropertyNode *longitude
+    //     = fgGetNode("/sim/presets/longitude-deg");
+    // static const SGPropertyNode *latitude
+    //     = fgGetNode("/sim/presets/latitude-deg");
+    // static const SGPropertyNode *altitude
+    //     = fgGetNode("/sim/presets/altitude-ft");
 
     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()->setFreezeProperty(fgGetNode("/sim/freeze/clock"));
+
+    ////////////////////////////////////////////////////////////////////
+    // 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.
@@ -874,43 +1508,31 @@ bool fgInitSubsystems( void ) {
 
     SGPath mpath( globals->get_fg_root() );
     mpath.append( "materials.xml" );
-    if ( ! material_lib.load( mpath.str() ) ) {
+    if ( ! globals->get_matlib()->load(globals->get_fg_root(), mpath.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.
     ////////////////////////////////////////////////////////////////////
 
-    if ( global_tile_mgr.init() ) {
+    if ( globals->get_tile_mgr()->init() ) {
         // Load the local scenery data
         double visibility_meters = fgGetDouble("/environment/visibility-m");
                 
-        global_tile_mgr.update( longitude->getDoubleValue(),
-                                latitude->getDoubleValue(),
-                                visibility_meters );
+        globals->get_tile_mgr()->update( 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 );
+    globals->get_event_mgr()->addTask( "FGTileMgr::refresh_view_timestamps()",
+                                       globals->get_tile_mgr(),
+                                       &FGTileMgr::refresh_view_timestamps,
+                                       15 );
 
     SG_LOG( SG_GENERAL, SG_DEBUG,
             "Current terrain elevation after tile mgr init " <<
@@ -929,44 +1551,30 @@ bool fgInitSubsystems( void ) {
 
 
     ////////////////////////////////////////////////////////////////////
-    // 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();
 
     ////////////////////////////////////////////////////////////////////
-    // Initialize the logger.
+    // Create and register the logger.
     ////////////////////////////////////////////////////////////////////
     
-    globals->get_subsystem_mgr()->add(FGSubsystemMgr::GENERAL,
-                                      "logger",
-                                      new FGLogger);
+    globals->add_subsystem("logger", new FGLogger);
+
+    ////////////////////////////////////////////////////////////////////
+    // Create and register the XML GUI.
+    ////////////////////////////////////////////////////////////////////
+
+    globals->add_subsystem("gui", new NewGUI, SGSubsystemMgr::INIT);
 
 
     ////////////////////////////////////////////////////////////////////
@@ -974,8 +1582,8 @@ bool fgInitSubsystems( void ) {
     ////////////////////////////////////////////////////////////////////
 
     // update the current timezone each 30 minutes
-    global_events.Register( "fgUpdateLocalTime()", &fgUpdateLocalTime,
-                            30*60*1000 );
+    globals->get_event_mgr()->addTask( "fgUpdateLocalTime()",
+                                       &fgUpdateLocalTime, 30*60 );
 
 
     ////////////////////////////////////////////////////////////////////
@@ -983,59 +1591,45 @@ bool fgInitSubsystems( void ) {
     ////////////////////////////////////////////////////////////////////
 
     // 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);
 
+    //////////////////////////////////////////////////////////////////////
+    // Initialize the 2D cloud subsystem.
+    ////////////////////////////////////////////////////////////////////
+    fgGetNode("/sim/rendering/bump-mapping", true);
+    fgSetBool("/sim/rendering/bump-mapping", true);
+
+#ifdef FG_USE_CLOUDS_3D
     ////////////////////////////////////////////////////////////////////
     // Initialize the 3D cloud subsystem.
     ////////////////////////////////////////////////////////////////////
     if ( fgGetBool("/sim/rendering/clouds3d") ) {
+        static const SGPropertyNode *longitude
+           = fgGetNode("/sim/presets/longitude-deg");
+        static const SGPropertyNode *latitude
+           = fgGetNode("/sim/presets/latitude-deg");
+        // static const SGPropertyNode *altitude
+        //    = fgGetNode("/sim/presets/altitude-ft");
+
         SGPath cloud_path(globals->get_fg_root());
-        cloud_path.append("large.sky");
+#if 0
+        cloud_path.append("Textures/Sky/scattered.rgba");
         SG_LOG(SG_GENERAL, SG_INFO, "Loading CLOUDS3d from: " << cloud_path.c_str());
+
+        SGTexture tx;
+        tx.read_rgba_texture(cloud_path.c_str());
+        if ( !sgCloud3d->Load( tx.texture(), tx.width(),
+#else
+        cloud_path.append("large.sky");
         if ( !sgCloud3d->Load( cloud_path.str(),
+#endif
                                latitude->getDoubleValue(),
                                longitude->getDoubleValue()) )
         {
@@ -1044,54 +1638,25 @@ bool fgInitSubsystems( void ) {
         }
         SG_LOG(SG_GENERAL, SG_INFO, "CLOUDS3d Loaded: ");
     }
+#endif
 
+#ifdef ENABLE_AUDIO_SUPPORT
     ////////////////////////////////////////////////////////////////////
-    // Initialize vor/ndb/ils/fix list management and query systems
+    // Initialize the sound subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    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 );
+    globals->set_soundmgr(new SGSoundMgr);
+    globals->get_soundmgr()->init();
+    globals->get_soundmgr()->bind();
 
-    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 );
 
     ////////////////////////////////////////////////////////////////////
-    // Initialize ATC list management and query systems
+    // Initialize the sound-effects subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    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 );
+    globals->add_subsystem("fx", new FGFX);
+    
+#endif
 
     ////////////////////////////////////////////////////////////////////
     // Initialise ATC display system
@@ -1113,52 +1678,37 @@ bool fgInitSubsystems( void ) {
     // Initialise the AI Manager 
     ////////////////////////////////////////////////////////////////////
 
-    if (fgGetBool("/sim/ai-traffic/enabled")) {
-        SG_LOG(SG_GENERAL, SG_INFO, "  AI Manager");
-        globals->set_AI_mgr(new FGAIMgr);
-        globals->get_AI_mgr()->init();
-    }
-
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the built-in commands.
-    ////////////////////////////////////////////////////////////////////
-    fgInitCommands();
-
+    SG_LOG(SG_GENERAL, SG_INFO, "  AI Manager");
+    globals->set_AI_mgr(new FGAIMgr);
+    globals->get_AI_mgr()->init();
 
-#ifdef ENABLE_AUDIO_SUPPORT
     ////////////////////////////////////////////////////////////////////
-    // Initialize the sound subsystem.
+    // Initialise the AI Model Manager
     ////////////////////////////////////////////////////////////////////
+    SG_LOG(SG_GENERAL, SG_INFO, "  AI Model Manager");
+    globals->add_subsystem("ai_model", new FGAIManager);
 
-    globals->set_soundmgr(new FGSoundMgr);
-    globals->get_soundmgr()->init();
-    globals->get_soundmgr()->bind();
 
+     // 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");
 
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the sound-effects subsystem.
-    ////////////////////////////////////////////////////////////////////
+     readXML(string(globals->get_fg_root() + string("/Traffic/fgtraffic.xml")),
+	     *dispatcher);
+     globals->get_subsystem("Traffic Manager")->init();
 
-    globals->get_subsystem_mgr()->add(FGSubsystemMgr::GENERAL,
-                                      "fx",
-                                      new FGFX);
-    
+    globals->add_subsystem("instrumentation", new FGInstrumentMgr);
+    globals->add_subsystem("systems", new FGSystemMgr);
 
-#endif
 
-    globals->get_subsystem_mgr()->add(FGSubsystemMgr::GENERAL,
-                                      "instrumentation",
-                                      new FGInstrumentMgr);
-    globals->get_subsystem_mgr()->add(FGSubsystemMgr::GENERAL,
-                                      "systems",
-                                      new FGSystemMgr);
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the radio stack subsystem.
     ////////////////////////////////////////////////////////////////////
 
-                                // A textbook example of how FGSubsystem
-                                // should work...
     current_radiostack = new FGRadioStack;
     current_radiostack->init();
     current_radiostack->bind();
@@ -1180,13 +1730,9 @@ bool fgInitSubsystems( void ) {
     // 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();
@@ -1198,27 +1744,25 @@ bool fgInitSubsystems( void ) {
     globals->get_io()->init();
     globals->get_io()->bind();
 
-    // Initialize the 2D panel.
+
+    ////////////////////////////////////////////////////////////////////
+    // Add a new 2D panel.
+    ////////////////////////////////////////////////////////////////////
+
     string panel_path = fgGetString("/sim/panel/path",
                                     "Panels/Default/default.xml");
-    current_panel = fgReadPanel(panel_path);
-    if (current_panel == 0) {
+
+    globals->set_current_panel( fgReadPanel(panel_path) );
+    if (globals->get_current_panel() == 0) {
         SG_LOG( SG_INPUT, SG_ALERT, 
                 "Error reading new panel from " << panel_path );
     } else {
         SG_LOG( SG_INPUT, SG_INFO, "Loaded new panel from " << panel_path );
-        current_panel->init();
-        current_panel->bind();
+        globals->get_current_panel()->init();
+        globals->get_current_panel()->bind();
     }
 
     
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the default (kludged) properties.
-    ////////////////////////////////////////////////////////////////////
-
-    fgInitProps();
-
-
     ////////////////////////////////////////////////////////////////////
     // Initialize the controls subsystem.
     ////////////////////////////////////////////////////////////////////
@@ -1228,21 +1772,16 @@ bool fgInitSubsystems( void ) {
 
 
     ////////////////////////////////////////////////////////////////////
-    // Initialize the steam subsystem.
+    // Initialize the input subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    globals->get_steam()->init();
-    globals->get_steam()->bind();
+    globals->add_subsystem("input", new FGInput);
 
 
     ////////////////////////////////////////////////////////////////////
-    // Initialize the input subsystem.
+    // Initialize the replay subsystem
     ////////////////////////////////////////////////////////////////////
-
-    globals->get_subsystem_mgr()->add(FGSubsystemMgr::GENERAL,
-                                      "input",
-                                      new FGInput);
-
+    globals->add_subsystem("replay", new FGReplay);
 
     ////////////////////////////////////////////////////////////////////
     // Bind and initialize subsystems.
@@ -1251,6 +1790,31 @@ bool fgInitSubsystems( void ) {
     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();
+#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();
+
 
     ////////////////////////////////////////////////////////////////////////
     // End of subsystem initialization.
@@ -1266,14 +1830,14 @@ bool fgInitSubsystems( void ) {
 }
 
 
-void fgReInitSubsystems( void )
+void fgReInitSubsystems()
 {
-    static const SGPropertyNode *longitude
-        = fgGetNode("/position/longitude-deg");
-    static const SGPropertyNode *latitude
-        = fgGetNode("/position/latitude-deg");
+    // static const SGPropertyNode *longitude
+    //     = fgGetNode("/sim/presets/longitude-deg");
+    // static const SGPropertyNode *latitude
+    //     = fgGetNode("/sim/presets/latitude-deg");
     static const SGPropertyNode *altitude
-        = fgGetNode("/position/altitude-ft");
+        = fgGetNode("/sim/presets/altitude-ft");
     static const SGPropertyNode *master_freeze
         = fgGetNode("/sim/freeze/master");
 
@@ -1285,33 +1849,31 @@ void fgReInitSubsystems( void )
     if ( !freeze ) {
         fgSetBool("/sim/freeze/master", true);
     }
-    
-    // Initialize the Scenery Management subsystem
-    // FIXME, what really needs to get initialized here, at the time
-    // this was commented out, scenery.init() was a noop
-    // scenery.init();
+    fgSetBool("/sim/crashed", false);
+    fgSetBool("/sim/initialised", false);
 
+    // Initialize the FDM
     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();
+    // reload offsets from config defaults
+    globals->get_viewmgr()->reinit();
 
     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/initialised", true);
 }