X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=src%2FMain%2Ffg_init.cxx;h=a78759c42f1a0c2384951f1b1293081f0d987c46;hb=b64259b2950d6bf0e6572e3362b6ee109104192e;hp=f60846a9004c04fa884446db3d74f2bf6fba93be;hpb=25bda870159ec353046f3e74d8d94d02a612a949;p=flightgear.git

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index f60846a90..a78759c42 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -35,6 +35,8 @@
 #if defined( _MSC_VER) || defined(__MINGW32__)
 #  include <direct.h>           // for getcwd()
 #  define getcwd _getcwd
+#  include <io.h>               // isatty()
+#  define isatty _isatty
 #endif
 
 // work around a stdc++ lib bug in some versions of linux, but doesn't
@@ -51,21 +53,22 @@
 #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/misc/interpolator.hxx>
 #include <simgear/scene/material/matlib.hxx>
 #include <simgear/scene/model/particles.hxx>
+#include <simgear/sound/soundmgr_openal.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/timing/lowleveltime.h>
 
 #include <Aircraft/aircraft.hxx>
+#include <Aircraft/controls.hxx>
 #include <Aircraft/replay.hxx>
 #include <Airports/apt_loader.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/simple.hxx>
+#include <Airports/dynamics.hxx>
+
 #include <AIModel/AIManager.hxx>
 #include <ATCDCL/ATCmgr.hxx>
 #include <ATCDCL/AIMgr.hxx>
@@ -96,12 +99,11 @@
 #include <AIModel/AIManager.hxx>
 #include <Navaids/navdb.hxx>
 #include <Navaids/navlist.hxx>
+#include <Navaids/fix.hxx>
+#include <Navaids/fixlist.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
 #include <Scripting/NasalSys.hxx>
-#include <Sound/fg_fx.hxx>
-#include <Sound/beacon.hxx>
-#include <Sound/morse.hxx>
 #include <Sound/voice.hxx>
 #include <Systems/system_mgr.hxx>
 #include <Time/light.hxx>
@@ -111,6 +113,7 @@
 #include <MultiPlayer/multiplaymgr.hxx>
 
 #include <Environment/environment_mgr.hxx>
+#include <Environment/ridge_lift.hxx>
 
 #include "fg_init.hxx"
 #include "fg_io.hxx"
@@ -122,17 +125,15 @@
 #include "renderer.hxx"
 #include "viewmgr.hxx"
 #include "main.hxx"
+#include "ATCDCL/commlist.hxx"
 
-#if defined(FX) && defined(XMESA)
-#include <GL/xmesa.h>
+#ifdef __APPLE__
+#  include <CoreFoundation/CoreFoundation.h>
 #endif
 
-SG_USING_STD(string);
-
+using std::string;
 
-class Sound;
 extern const char *default_root;
-float init_volume;
 
 
 // Scan the command line options for the specified option and return
@@ -407,7 +408,7 @@ SGPropertyNode *fgInitLocale(const char *language) {
    SGPropertyNode *strings = c_node->getNode("strings");
    try {
       readProperties(d_path.str(), strings);
-   } catch (const sg_exception &e) {
+   } catch (const sg_exception &) {
       SG_LOG(SG_GENERAL, SG_ALERT, "Unable to read the localized strings");
       return NULL;
    }
@@ -429,7 +430,7 @@ SGPropertyNode *fgInitLocale(const char *language) {
 
       try {
          readProperties(c_path.str(), strings);
-      } catch (const sg_exception &e) {
+      } catch (const sg_exception &) {
          SG_LOG(SG_GENERAL, SG_ALERT,
                  "Unable to read the localized strings from " << c_path.str());
          return NULL;
@@ -578,7 +579,7 @@ bool fgInitConfig ( int argc, char **argv ) {
     }
 
     SGPropertyNode autosave;
-#ifdef _MSC_VER
+#if defined( _MSC_VER ) || defined( __MINGW32__ )
     char *envp = ::getenv( "APPDATA" );
     if (envp != NULL ) {
         SGPath config( envp );
@@ -592,6 +593,10 @@ bool fgInitConfig ( int argc, char **argv ) {
         if (fg_home)
             config = fg_home;
 
+        SGPath home_export(config.str());
+        home_export.append("Export/dummy");
+        home_export.create_dir(0777);
+
         // Set /sim/fg-home and don't allow malign code to override it until
         // Nasal security is set up.  Use FG_HOME if necessary.
         SGPropertyNode *home = fgGetNode("/sim", true);
@@ -683,45 +688,6 @@ bool fgInitConfig ( int argc, char **argv ) {
     return true;
 }
 
-
-
-
-
-#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;
-
-    SG_LOG( SG_GENERAL, SG_INFO,
-            "Attempting to set starting position from airport code " << id );
-
-    if ( fgFindAirportID( id, &a ) ) {
-        // 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 << ")" );
-
-        return true;
-    } else {
-        return false;
-    }
-}
-#endif
-
-
 // Set current tower position lon/lat given an airport id
 static bool fgSetTowerPosFromAirportID( const string& id) {
     const FGAirport *a = fgFindAirportID( id);
@@ -749,10 +715,41 @@ void fgInitTowerLocationListener() {
         ->addChangeListener( new FGTowerLocationListener(), true );
 }
 
+static void fgApplyStartOffset(const SGGeod& aStartPos, double aHeading, double aTargetHeading = HUGE_VAL)
+{
+  SGGeod startPos(aStartPos);
+  if (aTargetHeading == HUGE_VAL) {
+    aTargetHeading = aHeading;
+  }
+  
+  if ( fabs( fgGetDouble("/sim/presets/offset-distance-nm") ) > SG_EPSILON ) {
+    double offsetDistance = fgGetDouble("/sim/presets/offset-distance-nm");
+    offsetDistance *= SG_NM_TO_METER;
+    double offsetAzimuth = aHeading;
+    if ( fabs(fgGetDouble("/sim/presets/offset-azimuth-deg")) > SG_EPSILON ) {
+      offsetAzimuth = fgGetDouble("/sim/presets/offset-azimuth-deg");
+      aHeading = aTargetHeading;
+    }
+
+    SGGeod offset;
+    double az2; // dummy
+    SGGeodesy::direct(startPos, offsetAzimuth + 180, offsetDistance, offset, az2);
+    startPos = offset;
+  }
+
+  // presets
+  fgSetDouble("/sim/presets/longitude-deg", startPos.getLongitudeDeg() );
+  fgSetDouble("/sim/presets/latitude-deg", startPos.getLatitudeDeg() );
+  fgSetDouble("/sim/presets/heading-deg", aHeading );
+
+  // other code depends on the actual values being set ...
+  fgSetDouble("/position/longitude-deg",  startPos.getLongitudeDeg() );
+  fgSetDouble("/position/latitude-deg",  startPos.getLatitudeDeg() );
+  fgSetDouble("/orientation/heading-deg", aHeading );
+}
+
 // Set current_options lon/lat given an airport id and heading (degrees)
 static bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
-    FGRunway r;
-
     if ( id.empty() )
         return false;
 
@@ -761,58 +758,13 @@ static bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
             "Attempting to set starting position from airport code "
             << id << " heading " << tgt_hdg );
 
-    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;
-    }
-    fgSetString("/sim/atc/runway", r._rwy_no.c_str());
-
-    double lat2, lon2, az2;
-    double heading = r._heading;
-    double azimuth = heading + 180.0;
-    while ( azimuth >= 360.0 ) { azimuth -= 360.0; }
+    const FGAirport* apt = fgFindAirportID(id);
+    if (!apt) return false;
+    FGRunway* r = apt->findBestRunwayForHeading(tgt_hdg);
+    fgSetString("/sim/atc/runway", r->ident().c_str());
 
-    SG_LOG( SG_GENERAL, SG_INFO,
-            "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
-            - fgGetDouble("/sim/airport/runways/start-offset-m", 5.0),
-            &lat2, &lon2, &az2 );
-
-    if ( fabs( fgGetDouble("/sim/presets/offset-distance-nm") ) > SG_EPSILON ) {
-        double olat, olon;
-        double odist = fgGetDouble("/sim/presets/offset-distance-nm");
-        odist *= SG_NM_TO_METER;
-        double oaz = azimuth;
-        if ( fabs(fgGetDouble("/sim/presets/offset-azimuth-deg")) > SG_EPSILON ) {
-            oaz = fgGetDouble("/sim/presets/offset-azimuth-deg") + 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 );
-
-    SG_LOG( SG_GENERAL, SG_INFO,
-            "Position for " << id << " is ("
-            << lon2 << ", "
-            << lat2 << ") new heading is "
-            << heading );
-	    
+    SGGeod startPos = r->pointOnCenterline(fgGetDouble("/sim/airport/runways/start-offset-m", 5.0));
+	  fgApplyStartOffset(startPos, r->headingDeg(), tgt_hdg);
     return true;
 }
 
@@ -824,8 +776,7 @@ static bool fgSetPosFromAirportIDandParkpos( const string& id, const string& par
     // can't see an easy way around this const_cast at the moment
     FGAirport* apt = const_cast<FGAirport*>(fgFindAirportID(id));
     if (!apt) {
-        SG_LOG( SG_GENERAL, SG_ALERT,
-                "Failed to find airport " << id );
+        SG_LOG( SG_GENERAL, SG_ALERT, "Failed to find airport " << id );
         return false;
     }
     FGAirportDynamics* dcs = apt->getDynamics();
@@ -845,35 +796,15 @@ static bool fgSetPosFromAirportIDandParkpos( const string& id, const string& par
         return false;
     }
     FGParking* parking = dcs->getParking(park_index);
-    
-    double lat = parking->getLatitude();
-    double lon = parking->getLongitude();
-    double hdg = parking->getHeading();
-    
-    // presets
-    fgSetDouble("/sim/presets/longitude-deg",  lon );
-    fgSetDouble("/sim/presets/latitude-deg",  lat );
-    fgSetDouble("/sim/presets/heading-deg", hdg );
-    
-    // other code depends on the actual values being set ...
-    fgSetDouble("/position/longitude-deg",  lon );
-    fgSetDouble("/position/latitude-deg",  lat );
-    fgSetDouble("/orientation/heading-deg", hdg );
-    
-    SG_LOG( SG_GENERAL, SG_INFO,
-    "Position for " << id << " is ("
-    << lon << ", "
-    << lat << ") new heading is "
-    << hdg );
-    
+    fgApplyStartOffset(
+      SGGeod::fromDeg(parking->getLongitude(), parking->getLatitude()),
+      parking->getHeading());
     return true;
 }
 
 
 // Set current_options lon/lat given an airport id and runway number
 static bool fgSetPosFromAirportIDandRwy( const string& id, const string& rwy, bool rwy_req ) {
-    FGRunway r;
-
     if ( id.empty() )
         return false;
 
@@ -882,61 +813,23 @@ static bool fgSetPosFromAirportIDandRwy( const string& id, const string& rwy, bo
             "Attempting to set starting position for "
             << id << ":" << rwy );
 
-    if ( ! globals->get_runways()->search( id, rwy, &r ) ) {
-        SG_LOG( SG_GENERAL, rwy_req ? SG_ALERT : SG_INFO,
-                "Failed to find runway " << rwy <<
-                " at airport " << id << ". Using default runway." );
-        return false;
+    const FGAirport* apt = fgFindAirportID(id);
+    if (!apt) {
+      SG_LOG( SG_GENERAL, SG_ALERT, "Failed to find airport:" << id);
+      return false;
     }
-    fgSetString("/sim/atc/runway", r._rwy_no.c_str());
-
-    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 );
-    
-    geo_direct_wgs_84 ( 0, r._lat, r._lon, azimuth, r._length * SG_FEET_TO_METER * 0.5
-            - fgGetDouble("/sim/airport/runways/start-offset-m", 5.0),
-            &lat2, &lon2, &az2 );
-    
-    if ( fabs( fgGetDouble("/sim/presets/offset-distance-nm") ) > SG_EPSILON )
-    {
-	double olat, olon;
-	double odist = fgGetDouble("/sim/presets/offset-distance-nm");
-	odist *= SG_NM_TO_METER;
-	double oaz = azimuth;
-	if ( fabs(fgGetDouble("/sim/presets/offset-azimuth-deg")) > SG_EPSILON )
-	{
-	    oaz = fgGetDouble("/sim/presets/offset-azimuth-deg") + 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;
+    if (!apt->hasRunwayWithIdent(rwy)) {
+      SG_LOG( SG_GENERAL, rwy_req ? SG_ALERT : SG_INFO,
+                "Failed to find runway " << rwy <<
+                " at airport " << id << ". Using default runway." );
+      return false;
     }
     
-    // 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 );
-    
+    FGRunway* r(apt->getRunwayByIdent(rwy));
+    fgSetString("/sim/atc/runway", r->ident().c_str());
+    SGGeod startPos = r->pointOnCenterline( fgGetDouble("/sim/airport/runways/start-offset-m", 5.0));
+	  fgApplyStartOffset(startPos, r->headingDeg());
     return true;
 }
 
@@ -990,48 +883,14 @@ 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-nm") ) > SG_EPSILON )
-        {
-            double odist = fgGetDouble("/sim/presets/offset-distance-nm")
-                * SG_NM_TO_METER;
-            double oaz = fabs(fgGetDouble("/sim/presets/offset-azimuth-deg"))
-                + 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 = "
+  if (!nav) {
+    SG_LOG( SG_GENERAL, SG_ALERT, "Failed to locate NAV = "
                 << id << ":" << freq );
-        return false;
-    }
+    return false;
+  }
+  
+  fgApplyStartOffset(nav->geod(), fgGetDouble("/sim/presets/heading-deg"));
+  return true;
 }
 
 // Set current_options lon/lat given an aircraft carrier id
@@ -1078,54 +937,19 @@ static bool fgSetPosFromCarrier( const string& carrier, const string& posid ) {
 }
  
 // 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-nm") ) > SG_EPSILON )
-        {
-            double odist = fgGetDouble("/sim/presets/offset-distance-nm")
-                * SG_NM_TO_METER;
-            double oaz = fabs(fgGetDouble("/sim/presets/offset-azimuth-deg"))
-                + 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 bool fgSetPosFromFix( const string& id )
+{
+  FGPositioned::TypeFilter fixFilter(FGPositioned::FIX);
+  FGPositioned* fix = FGPositioned::findNextWithPartialId(NULL, id, &fixFilter);
+  if (!fix) {
+    SG_LOG( SG_GENERAL, SG_ALERT, "Failed to locate fix = " << id );
+    return false;
+  }
+  
+  fgApplyStartOffset(fix->geod(), fgGetDouble("/sim/presets/heading-deg"));
+  return true;
 }
 
-
 /**
  * Initialize vor/ndb/ils/fix list management and query systems (as
  * well as simple airport db list)
@@ -1141,18 +965,16 @@ fgInitNav ()
     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() );
+// Initialise the frequency search map BEFORE reading
+// the airport database:
+    current_commlist = new FGCommList;
+    current_commlist->init( globals->get_fg_root() );
+    fgAirportDBLoad( aptdb.str(), current_commlist, 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;
@@ -1161,33 +983,20 @@ fgInitNav ()
     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) ) {
+    if ( !fgNavDBInit(navlist, loclist, gslist, dmelist, 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");
     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 );
+    FGFixList fixlist;
+    fixlist.init( p_fix );  // adds fixes to the DB in positioned.cxx
 
     SG_LOG(SG_GENERAL, SG_INFO, "  Airways");
     SGPath p_awy( globals->get_fg_root() );
@@ -1353,10 +1162,6 @@ bool fgInitPosition() {
 bool fgInitGeneral() {
     string root;
 
-#if defined(FX) && defined(XMESA)
-    char *mesa_win_state;
-#endif
-
     SG_LOG( SG_GENERAL, SG_INFO, "General Initialization" );
     SG_LOG( SG_GENERAL, SG_INFO, "======= ==============" );
 
@@ -1372,21 +1177,6 @@ bool fgInitGeneral() {
 
     globals->set_browser(fgGetString("/sim/startup/browser-app", "firefox %u"));
 
-#if defined(FX) && defined(XMESA)
-    // initialize full screen flag
-    globals->set_fullscreen(false);
-    if ( strstr ( general.get_glRenderer(), "Glide" ) ) {
-        // Test for the MESA_GLX_FX env variable
-        if ( (mesa_win_state = getenv( "MESA_GLX_FX" )) != NULL) {
-            // test if we are fullscreen mesa/glide
-            if ( (mesa_win_state[0] == 'f') ||
-                 (mesa_win_state[0] == 'F') ) {
-                globals->set_fullscreen(true);
-            }
-        }
-    }
-#endif
-
     char buf[512], *cwd = getcwd(buf, 511);
     buf[511] = '\0';
     SGPropertyNode *curr = fgGetNode("/sim", true);
@@ -1394,6 +1184,9 @@ bool fgInitGeneral() {
     curr = curr->getChild("fg-current", 0, true);
     curr->setStringValue(cwd ? cwd : "");
     curr->setAttribute(SGPropertyNode::WRITE, false);
+
+    fgSetBool("/sim/startup/stdout-to-terminal", isatty(1));
+    fgSetBool("/sim/startup/stderr-to-terminal", isatty(2));
     return true;
 }
 
@@ -1487,7 +1280,7 @@ void fgInitFDM() {
     } else if ( model == "yasim" ) {
         cur_fdm_state = new YASim( dt );
     } else {
-        throw sg_throwable(string("Unrecognized flight model '") + model
+        throw sg_exception(string("Unrecognized flight model '") + model
                + "', cannot init flight dynamics model.");
     }
 }
@@ -1673,8 +1466,7 @@ bool fgInitSubsystems() {
 
     SGPath mpath( globals->get_fg_root() );
     mpath.append( "materials.xml" );
-    string season = fgGetString("/sim/startup/season", "summer");
-    if ( ! globals->get_matlib()->load(globals->get_fg_root(), mpath.str(), season.c_str(),
+    if ( ! globals->get_matlib()->load(globals->get_fg_root(), mpath.str(),
             globals->get_props()) ) {
         SG_LOG( SG_GENERAL, SG_ALERT, "Error loading material lib!" );
         exit(-1);
@@ -1697,6 +1489,7 @@ bool fgInitSubsystems() {
 
     globals->get_scenery()->get_scene_graph()
         ->addChild(simgear::Particles::getCommonRoot());
+    simgear::GlobalParticleCallback::setSwitch(fgGetNode("/sim/rendering/particles", true));
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the flight model subsystem.
@@ -1716,6 +1509,12 @@ bool fgInitSubsystems() {
     // Initialize the weather modeling subsystem
     globals->add_subsystem("environment", new FGEnvironmentMgr);
 
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the ridge lift simulation.
+    ////////////////////////////////////////////////////////////////////
+
+    // Initialize the ridgelift subsystem
+    globals->add_subsystem("ridgelift", new FGRidgeLift);
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the aircraft systems and instrumentation (before the
@@ -1732,13 +1531,17 @@ bool fgInitSubsystems() {
     globals->add_subsystem( "xml-autopilot", new FGXMLAutopilot );
     globals->add_subsystem( "route-manager", new FGRouteMgr );
 
-  
     ////////////////////////////////////////////////////////////////////
     // Initialize the view manager subsystem.
     ////////////////////////////////////////////////////////////////////
 
     fgInitView();
 
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the Input-Output subsystem
+    ////////////////////////////////////////////////////////////////////
+    globals->add_subsystem( "io", new FGIO );
+
     ////////////////////////////////////////////////////////////////////
     // Create and register the logger.
     ////////////////////////////////////////////////////////////////////
@@ -1774,22 +1577,9 @@ bool fgInitSubsystems() {
     fgGetBool("/sim/rendering/bump-mapping", false);
 
 #ifdef ENABLE_AUDIO_SUPPORT
-    ////////////////////////////////////////////////////////////////////
-    // 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);
     globals->add_subsystem("voice", new FGVoiceMgr);
 #endif
 
@@ -1834,14 +1624,6 @@ bool fgInitSubsystems() {
     }
 
 
-    ////////////////////////////////////////////////////////////////////
-    // Initialize I/O subsystem.
-    ////////////////////////////////////////////////////////////////////
-
-    globals->get_io()->init();
-    globals->get_io()->bind();
-
-
     ////////////////////////////////////////////////////////////////////
     // Add a new 2D panel.
     ////////////////////////////////////////////////////////////////////
@@ -1880,6 +1662,7 @@ bool fgInitSubsystems() {
     ////////////////////////////////////////////////////////////////////
     globals->add_subsystem("replay", new FGReplay);
 
+
     ////////////////////////////////////////////////////////////////////
     // Bind and initialize subsystems.
     ////////////////////////////////////////////////////////////////////
@@ -1986,6 +1769,14 @@ void reInit(void)  // from gui_local.cxx -- TODO merge with fgReInitSubsystems()
     int xsize = fgGetInt("/sim/startup/xsize");
     int ysize = fgGetInt("/sim/startup/ysize");
 
+    // viewports also needs to be saved/restored as
+    // restoreInitialState() overwrites these
+    SGPropertyNode *guiNode = new SGPropertyNode;
+    SGPropertyNode *cameraNode = new SGPropertyNode;
+    SGPropertyNode *cameraGroupNode = fgGetNode("/sim/rendering/camera-group");
+    copyProperties(cameraGroupNode->getChild("camera"), cameraNode);
+    copyProperties(cameraGroupNode->getChild("gui"), guiNode);
+
     globals->restoreInitialState();
 
     // update our position based on current presets
@@ -1996,6 +1787,12 @@ void reInit(void)  // from gui_local.cxx -- TODO merge with fgReInitSubsystems()
     fgSetInt("/sim/startup/xsize", xsize);
     fgSetInt("/sim/startup/ysize", ysize);
 
+    copyProperties(cameraNode, cameraGroupNode->getChild("camera"));
+    copyProperties(guiNode, cameraGroupNode->getChild("gui"));
+
+    delete guiNode;
+    delete cameraNode;
+
     SGTime *t = globals->get_time_params();
     delete t;
     t = fgInitTime();