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

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 44117baa2..dae961c61 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -31,11 +31,15 @@
 #  include <math.h>
 #endif
 
+#ifdef HAVE_WINDOWS_H
+#  include <windows.h>
+#endif
+
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>		// strcmp()
 
 
 #if defined( unix ) || defined( __CYGWIN__ )
@@ -49,6 +53,7 @@
 #endif
 
 #include <simgear/compiler.h>
+#include <simgear/misc/exception.hxx>
 
 #include STL_STRING
 
@@ -57,13 +62,20 @@
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/timing/sg_time.hxx>
+#include <simgear/timing/lowleveltime.h>
 
 #include <Aircraft/aircraft.hxx>
 #include <FDM/UIUCModel/uiuc_aircraftdir.h>
 #include <Airports/runways.hxx>
 #include <Airports/simple.hxx>
+#include <ATC/ATCdisplay.hxx>
+#include <ATC/ATCmgr.hxx>
+#include <ATC/atislist.hxx>
+#include <ATC/towerlist.hxx>
+#include <ATC/approachlist.hxx>
+#include <ATC/AIMgr.hxx>
 #include <Autopilot/auto_gui.hxx>
 #include <Autopilot/newauto.hxx>
 #include <Cockpit/cockpit.hxx>
@@ -73,35 +85,46 @@
 #include <FDM/ADA.hxx>
 #include <FDM/Balloon.h>
 #include <FDM/External.hxx>
-#include <FDM/JSBSim.hxx>
+#include <FDM/ExternalNet.hxx>
+#include <FDM/JSBSim/JSBSim.hxx>
 #include <FDM/LaRCsim.hxx>
 #include <FDM/MagicCarpet.hxx>
+#include <FDM/UFO.hxx>
+#include <FDM/NullFDM.hxx>
+#include <FDM/YASim/YASim.hxx>
 #include <Include/general.hxx>
-#include <Joystick/joystick.hxx>
+#include <Input/input.hxx>
+// #include <Joystick/joystick.hxx>
 #include <Objects/matlib.hxx>
+#include <Model/acmodel.hxx>
 #include <Navaids/fixlist.hxx>
 #include <Navaids/ilslist.hxx>
 #include <Navaids/mkrbeacons.hxx>
 #include <Navaids/navlist.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
-#include <Time/event.hxx>
+#include <Sound/fg_fx.hxx>
+#include <Sound/soundmgr.hxx>
+#include <Time/FGEventMgr.hxx>
 #include <Time/light.hxx>
 #include <Time/sunpos.hxx>
 #include <Time/moonpos.hxx>
 #include <Time/tmp.hxx>
 
-#ifndef FG_OLD_WEATHER
+#ifdef FG_WEATHERCM
 #  include <WeatherCM/FGLocalWeatherDatabase.h>
 #else
-#  include <Weather/weather.hxx>
+#  include <Environment/environment_mgr.hxx>
 #endif
 
 #include "fg_init.hxx"
 #include "fg_io.hxx"
+#include "fg_commands.hxx"
+#include "fg_props.hxx"
 #include "options.hxx"
 #include "globals.hxx"
-#include "bfi.hxx"
+#include "logger.hxx"
+#include "viewmgr.hxx"
 
 #if defined(FX) && defined(XMESA)
 #include <GL/xmesa.h>
@@ -123,10 +146,10 @@ bool fgInitFGRoot ( int argc, char **argv ) {
 
 #if defined( unix ) || defined( __CYGWIN__ )
     // Next check home directory for .fgfsrc.hostname file
-    if ( root == "" ) {
+    if ( root.empty() ) {
 	envp = ::getenv( "HOME" );
 	if ( envp != NULL ) {
-	    FGPath config( envp );
+	    SGPath config( envp );
 	    config.append( ".fgfsrc" );
 	    char name[256];
 	    gethostname( name, 256 );
@@ -138,17 +161,17 @@ bool fgInitFGRoot ( int argc, char **argv ) {
 #endif
 
     // Next check home directory for .fgfsrc file
-    if ( root == "" ) {
+    if ( root.empty() ) {
 	envp = ::getenv( "HOME" );
 	if ( envp != NULL ) {
-	    FGPath config( envp );
+	    SGPath config( envp );
 	    config.append( ".fgfsrc" );
 	    root = fgScanForRoot(config.str());
 	}
     }
     
     // Next check if fg-root is set as an env variable
-    if ( root == "" ) {
+    if ( root.empty() ) {
 	envp = ::getenv( "FG_ROOT" );
 	if ( envp != NULL ) {
 	    root = envp;
@@ -157,8 +180,10 @@ bool fgInitFGRoot ( int argc, char **argv ) {
 
     // Otherwise, default to a random compiled-in location if we can't
     // find fg-root any other way.
-    if ( root == "" ) {
-#if defined( WIN32 )
+    if ( root.empty() ) {
+#if defined( __CYGWIN__ )
+        root = "/FlightGear";
+#elif defined( WIN32 )
 	root = "\\FlightGear";
 #elif defined( macintosh )
 	root = "";
@@ -167,13 +192,37 @@ bool fgInitFGRoot ( int argc, char **argv ) {
 #endif
     }
 
-    FG_LOG(FG_INPUT, FG_INFO, "fg_root = " << root );
+    SG_LOG(SG_INPUT, SG_INFO, "fg_root = " << root );
     globals->set_fg_root(root);
 
     return true;
 }
 
 
+// Return the current base package version
+string fgBasePackageVersion() {
+    SGPath base_path( globals->get_fg_root() );
+    base_path.append("version");
+
+    sg_gzifstream in( base_path.str() );
+    if ( !in.is_open() ) {
+	SGPath old_path( globals->get_fg_root() );
+	old_path.append( "Thanks" );
+	sg_gzifstream old( old_path.str() );
+	if ( !old.is_open() ) {
+	    return "[none]";
+	} else {
+	    return "[old version]";
+	}
+    }
+
+    string version;
+    in >> version;
+
+    return version;
+}
+
+
 // Read in configuration (file and command line)
 bool fgInitConfig ( int argc, char **argv ) {
 
@@ -181,26 +230,43 @@ bool fgInitConfig ( int argc, char **argv ) {
     fgSetDefaults();
 
     // Read global preferences from $FG_ROOT/preferences.xml
-    FGPath props_path(globals->get_fg_root());
+    SGPath props_path(globals->get_fg_root());
     props_path.append("preferences.xml");
-    FG_LOG(FG_INPUT, FG_INFO, "Reading global preferences");
-    if (!readProperties(props_path.str(), globals->get_props())) {
-      FG_LOG(FG_INPUT, FG_ALERT, "Failed to read global preferences from "
-	     << props_path.str());
+    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");
+
+    // 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 {
-      FG_LOG(FG_INPUT, FG_INFO, "Finished Reading global preferences");
+      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
 
     // Check for $fg_root/system.fgfsrc
-    FGPath config( globals->get_fg_root() );
+    SGPath config( globals->get_fg_root() );
     config.append( "system.fgfsrc" );
     fgParseOptions(config.str());
 
-    char name[256];
 #if defined( unix ) || defined( __CYGWIN__ )
+    char name[256];
     // Check for $fg_root/system.fgfsrc.hostname
     gethostname( name, 256 );
     config.concat( "." );
@@ -226,7 +292,7 @@ bool fgInitConfig ( int argc, char **argv ) {
 
     // Parse remaining command line options
     // These will override anything specified in a config file
-    fgParseOptions(argc, argv);
+    fgParseArgs(argc, argv);
 
     return true;
 }
@@ -235,15 +301,15 @@ bool fgInitConfig ( int argc, char **argv ) {
 // find basic airport location info from airport database
 bool fgFindAirportID( const string& id, FGAirport *a ) {
     if ( id.length() ) {
-	FGPath path( globals->get_fg_root() );
+	SGPath path( globals->get_fg_root() );
 	path.append( "Airports" );
 	path.append( "simple.mk4" );
 	FGAirports airports( path.c_str() );
 
-	FG_LOG( FG_GENERAL, FG_INFO, "Searching for airport code = " << id );
+	SG_LOG( SG_GENERAL, SG_INFO, "Searching for airport code = " << id );
 
 	if ( ! airports.search( id, a ) ) {
-	    FG_LOG( FG_GENERAL, FG_ALERT,
+	    SG_LOG( SG_GENERAL, SG_ALERT,
 		    "Failed to find " << id << " in " << path.str() );
 	    return false;
 	}
@@ -251,7 +317,7 @@ bool fgFindAirportID( const string& id, FGAirport *a ) {
 	return false;
     }
 
-    FG_LOG( FG_GENERAL, FG_INFO,
+    SG_LOG( SG_GENERAL, SG_INFO,
 	    "Position for " << id << " is ("
 	    << a->longitude << ", "
 	    << a->latitude << ")" );
@@ -265,13 +331,13 @@ bool fgSetPosFromAirportID( const string& id ) {
     FGAirport a;
     // double lon, lat;
 
-    FG_LOG( FG_GENERAL, FG_INFO,
+    SG_LOG( SG_GENERAL, SG_INFO,
 	    "Attempting to set starting position from airport code " << id );
 
     if ( fgFindAirportID( id, &a ) ) {
-	fgSetDouble("/position/longitude",  a.longitude );
-	fgSetDouble("/position/latitude",  a.latitude );
-	FG_LOG( FG_GENERAL, FG_INFO,
+	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 << ")" );
@@ -284,6 +350,29 @@ bool fgSetPosFromAirportID( const string& id ) {
 }
 
 
+
+// Set current tower position lon/lat given an airport id
+bool fgSetTowerPosFromAirportID( const string& id, double hdg ) {
+    FGAirport a;
+    // tower height hard coded for now...
+    float towerheight=50.0f;
+
+    // make a little off the heading for 1 runway airports...
+    float fudge_lon = fabs(sin(hdg)) * .003f;
+    float fudge_lat = .003f - fudge_lon;
+
+    if ( fgFindAirportID( id, &a ) ) {
+	fgSetDouble("/sim/tower/longitude-deg",  a.longitude + fudge_lon);
+	fgSetDouble("/sim/tower/latitude-deg",  a.latitude + fudge_lat);
+        fgSetDouble("/sim/tower/altitude-ft", a.elevation + towerheight);
+	return true;
+    } else {
+	return false;
+    }
+
+}
+
+
 // Set current_options lon/lat given an airport id and heading (degrees)
 bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     FGRunway r;
@@ -291,71 +380,71 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     double found_dir = 0.0;
 
     if ( id.length() ) {
-	// set initial position from runway and heading
-
-	FGPath path( globals->get_fg_root() );
-	path.append( "Airports" );
-	path.append( "runways.mk4" );
-	FGRunways runways( path.c_str() );
-
-	FG_LOG( FG_GENERAL, FG_INFO,
-		"Attempting to set starting position from runway code "
-		<< id << " heading " << tgt_hdg );
-
-	// FGPath inpath( globals->get_fg_root() );
-	// inpath.append( "Airports" );
-	// inpath.append( "apt_simple" );
-	// airports.load( inpath.c_str() );
-
-	// FGPath outpath( globals->get_fg_root() );
-	// outpath.append( "Airports" );
-	// outpath.append( "simple.gdbm" );
-	// airports.dump_gdbm( outpath.c_str() );
-
-	if ( ! runways.search( id, &r ) ) {
-	    FG_LOG( FG_GENERAL, FG_ALERT,
-		    "Failed to find " << id << " in database." );
-	    return false;
-	}
-
-	double diff;
-	double min_diff = 360.0;
-
-	while ( r.id == id ) {
-	    // forward direction
-	    diff = tgt_hdg - r.heading;
-	    while ( diff < -180.0 ) { diff += 360.0; }
-	    while ( diff >  180.0 ) { diff -= 360.0; }
-	    diff = fabs(diff);
-	    FG_LOG( FG_GENERAL, FG_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);
-	    FG_LOG( FG_GENERAL, FG_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 );
-	}
-
-	FG_LOG( FG_GENERAL, FG_INFO, "closest runway = " << found_r.rwy_no
-		<< " + " << found_dir );
+        // set initial position from runway and heading
+
+        SGPath path( globals->get_fg_root() );
+        path.append( "Airports" );
+        path.append( "runways.mk4" );
+        FGRunways runways( path.c_str() );
+
+        SG_LOG( SG_GENERAL, SG_INFO,
+                "Attempting to set starting position from runway code "
+                << id << " heading " << tgt_hdg );
+
+        // SGPath inpath( globals->get_fg_root() );
+        // inpath.append( "Airports" );
+        // inpath.append( "apt_simple" );
+        // airports.load( inpath.c_str() );
+
+        // SGPath outpath( globals->get_fg_root() );
+        // outpath.append( "Airports" );
+        // outpath.append( "simple.gdbm" );
+        // airports.dump_gdbm( outpath.c_str() );
+
+        if ( ! runways.search( id, &r ) ) {
+            SG_LOG( SG_GENERAL, SG_ALERT,
+                    "Failed to find " << id << " in database." );
+            return false;
+        }
+
+        double diff;
+        double min_diff = 360.0;
+
+        while ( r.id == id ) {
+            // forward direction
+            diff = tgt_hdg - r.heading;
+            while ( diff < -180.0 ) { diff += 360.0; }
+            while ( diff >  180.0 ) { diff -= 360.0; }
+            diff = fabs(diff);
+            SG_LOG( SG_GENERAL, SG_INFO,
+                    "Runway " << r.rwy_no << " heading = " << r.heading <<
+                    " diff = " << diff );
+            if ( diff < min_diff ) {
+                min_diff = diff;
+                found_r = r;
+                found_dir = 0;
+            }
+
+            // reverse direction
+            diff = tgt_hdg - r.heading - 180.0;
+            while ( diff < -180.0 ) { diff += 360.0; }
+            while ( diff >  180.0 ) { diff -= 360.0; }
+            diff = fabs(diff);
+            SG_LOG( SG_GENERAL, SG_INFO,
+                    "Runway -" << r.rwy_no << " heading = " <<
+                    r.heading + 180.0 <<
+                    " diff = " << diff );
+            if ( diff < min_diff ) {
+                min_diff = diff;
+                found_r = r;
+                found_dir = 180.0;
+            }
+
+            runways.next( &r );
+        }
+
+        SG_LOG( SG_GENERAL, SG_INFO, "closest runway = " << found_r.rwy_no
+                << " + " << found_dir );
 
     } else {
 	return false;
@@ -368,19 +457,19 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     double azimuth = found_r.heading + found_dir + 180.0;
     while ( azimuth >= 360.0 ) { azimuth -= 360.0; }
 
-    FG_LOG( FG_GENERAL, FG_INFO,
+    SG_LOG( SG_GENERAL, SG_INFO,
 	    "runway =  " << found_r.lon << ", " << found_r.lat
-	    << " length = " << found_r.length * FEET_TO_METER * 0.5 
+	    << " length = " << found_r.length * SG_FEET_TO_METER * 0.5 
 	    << " heading = " << azimuth );
     
     geo_direct_wgs_84 ( 0, found_r.lat, found_r.lon, 
-			azimuth, found_r.length * FEET_TO_METER * 0.5 - 5.0,
+			azimuth, found_r.length * SG_FEET_TO_METER * 0.5 - 5.0,
 			&lat2, &lon2, &az2 );
 
     if ( fabs( fgGetDouble("/sim/startup/offset-distance") ) > SG_EPSILON ) {
 	double olat, olon;
 	double odist = fgGetDouble("/sim/startup/offset-distance");
-	odist *= NM_TO_METER;
+	odist *= SG_NM_TO_METER;
 	double oaz = azimuth;
 	if ( fabs(fgGetDouble("/sim/startup/offset-azimuth")) > SG_EPSILON ) {
 	    oaz = fgGetDouble("/sim/startup/offset-azimuth") + 180;
@@ -390,11 +479,12 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
 	lat2=olat;
 	lon2=olon;
     }
-    fgSetDouble("/position/longitude",  lon2 );
-    fgSetDouble("/position/latitude",  lat2 );
-    fgSetDouble("/orientation/heading", heading );
+	
+    fgSetDouble("/position/longitude-deg",  lon2 );
+    fgSetDouble("/position/latitude-deg",  lat2 );
+    fgSetDouble("/orientation/heading-deg", heading );
 
-    FG_LOG( FG_GENERAL, FG_INFO,
+    SG_LOG( SG_GENERAL, SG_INFO,
 	    "Position for " << id << " is ("
 	    << lon2 << ", "
 	    << lat2 << ") new heading is "
@@ -404,47 +494,33 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
 }
 
 
-// Set initial position and orientation
-bool fgInitPosition( void ) {
-    FGInterface *f = current_aircraft.fdm_state;
-    string id = fgGetString("/sim/startup/airport-id");
-
-    // set initial position from default or command line coordinates
-    f->set_Longitude( fgGetDouble("/position/longitude") * SGD_DEGREES_TO_RADIANS );
-    f->set_Latitude( fgGetDouble("/position/latitude") * SGD_DEGREES_TO_RADIANS );
-
-    FG_LOG( FG_GENERAL, FG_INFO,
-	    "scenery.cur_elev = " << scenery.cur_elev );
-    FG_LOG( FG_GENERAL, FG_INFO,
-	    "/position/altitude = " << fgGetDouble("/position/altitude") );
-
-    // if we requested on ground startups
-    if ( fgGetBool( "/sim/startup/onground" ) ) {
-        fgSetDouble( "/position/altitude", (scenery.cur_elev + 1)
-		     * METERS_TO_FEET );
-    }
-
-    // if requested altitude is below ground level
-    if ( scenery.cur_elev >
-	 fgGetDouble("/position/altitude") * METERS_TO_FEET - 1) {
-	fgSetDouble("/position/altitude",
-		    (scenery.cur_elev + 1) * METERS_TO_FEET );
-    }
-
-    FG_LOG( FG_GENERAL, FG_INFO,
-	    "starting altitude is = " <<
-	    fgGetDouble("/position/altitude") );
-
-    f->set_Altitude( fgGetDouble("/position/altitude") );
-    FG_LOG( FG_GENERAL, FG_INFO,
-	    "Initial position is: ("
-	    << (f->get_Longitude() * SGD_RADIANS_TO_DEGREES) << ", "
-	    << (f->get_Latitude() * SGD_RADIANS_TO_DEGREES) << ", "
-	    << (f->get_Altitude() * FEET_TO_METER) << ")" );
-
-    return true;
-}
-
+void fgSetPosFromGlideSlope(void) {
+    double gs = fgGetDouble("/velocities/glideslope");
+    double od = fgGetDouble("/sim/startup/offset-distance");
+    double alt = fgGetDouble("/position/altitude-ft");
+    
+    //if glideslope and offset-distance are set and altitude is
+    //not, calculate the initial altitude
+    if( fabs(gs) > 0.01 && fabs(od) > 0.1 && alt < -9990 ) {
+    	od *= SG_NM_TO_METER * SG_METER_TO_FEET;
+	alt = fabs(od*tan(gs));
+	fgSetDouble("/position/altitude-ft",alt);
+	fgSetBool("/sim/startup/onground", false);
+	SG_LOG(SG_GENERAL,SG_INFO, "Calculated altitude as: " << alt  << " ft");
+    } else if( fabs(gs) > 0.01 && alt > 0 && fabs(od) < 0.1) {
+    	od  = alt/tan(gs);
+	od *= -1*SG_FEET_TO_METER * SG_METER_TO_NM;
+	fgSetDouble("/sim/startup/offset-distance",od);
+	SG_LOG(SG_GENERAL,SG_INFO, "Calculated offset distance as: " 
+	                               << od  << " nm");
+    } else if( fabs(gs) > 0.01 ) {
+    	SG_LOG(SG_GENERAL,SG_ALERT, "Glideslope given but not altitude" 
+	                          << " or offset-distance.  Resetting"
+				  << " glideslope to zero" );
+        fgSetDouble("/velocities/glideslope",0);				  
+    }				   
+	                              
+}    			
 
 // General house keeping initializations
 bool fgInitGeneral( void ) {
@@ -454,29 +530,29 @@ bool fgInitGeneral( void ) {
     char *mesa_win_state;
 #endif
 
-    FG_LOG( FG_GENERAL, FG_INFO, "General Initialization" );
-    FG_LOG( FG_GENERAL, FG_INFO, "======= ==============" );
+    SG_LOG( SG_GENERAL, SG_INFO, "General Initialization" );
+    SG_LOG( SG_GENERAL, SG_INFO, "======= ==============" );
 
     root = globals->get_fg_root();
     if ( ! root.length() ) {
 	// No root path set? Then bail ...
-	FG_LOG( FG_GENERAL, FG_ALERT,
-		"Cannot continue without environment variable FG_ROOT"
+	SG_LOG( SG_GENERAL, SG_ALERT,
+		"Cannot continue without a path to the base package "
 		<< "being defined." );
 	exit(-1);
     }
-    FG_LOG( FG_GENERAL, FG_INFO, "FG_ROOT = " << '"' << root << '"' << endl );
+    SG_LOG( SG_GENERAL, SG_INFO, "FG_ROOT = " << '"' << root << '"' << endl );
 
 #if defined(FX) && defined(XMESA)
     // initialize full screen flag
-    global_fullscreen = false;
+    globals->set_fullscreen(false);
     if ( strstr ( general.get_glRenderer(), "Glide" ) ) {
 	// Test for the MESA_GLX_FX env variable
 	if ( (mesa_win_state = getenv( "MESA_GLX_FX" )) != NULL) {
 	    // test if we are fullscreen mesa/glide
 	    if ( (mesa_win_state[0] == 'f') ||
 		 (mesa_win_state[0] == 'F') ) {
-		global_fullscreen = true;
+	        globals->set_fullscreen(true);
 	    }
 	}
     }
@@ -486,336 +562,472 @@ bool fgInitGeneral( void ) {
 }
 
 
-// set initial aircraft speed
-void
-fgVelocityInit( void ) 
-{
-  if (!fgHasValue("/sim/startup/speed-set")) {
-    current_aircraft.fdm_state->set_V_calibrated_kts(0.0);
-    return;
-  }
-
-  const string speedset = fgGetString("/sim/startup/speed-set");
-  if (speedset == "knots" || speedset == "KNOTS") {
-    current_aircraft.fdm_state
-      ->set_V_calibrated_kts(fgGetDouble("/velocities/airspeed"));
-  } else if (speedset == "mach" || speedset == "MACH") {
-    current_aircraft.fdm_state
-      ->set_Mach_number(fgGetDouble("/velocities/mach"));
-  } else if (speedset == "UVW" || speedset == "uvw") {
-    current_aircraft.fdm_state
-      ->set_Velocities_Wind_Body(fgGetDouble("/velocities/uBody"),
-				 fgGetDouble("/velocities/vBody"),
-				 fgGetDouble("/velocities/wBody"));
-  } else if (speedset == "NED" || speedset == "ned") {
-    current_aircraft.fdm_state
-      ->set_Velocities_Local(fgGetDouble("/velocities/speed-north"),
-			     fgGetDouble("/velocities/speed-east"),
-			     fgGetDouble("/velocities/speed-down"));
-  } else {
-    FG_LOG(FG_GENERAL, FG_ALERT,
-	   "Unrecognized value for /sim/startup/speed-set: " << speedset);
-    current_aircraft.fdm_state->set_V_calibrated_kts(0.0);
-  }
-}             
-
-        
+// Initialize the flight model subsystem.  This just creates the
+// object.  The actual fdm initialization is delayed until we get a
+// proper scenery elevation hit.  This is checked for in main.cxx
+
+void fgInitFDM() {
+
+    if ( cur_fdm_state ) {
+        delete cur_fdm_state;
+        cur_fdm_state = 0;
+    }
+
+    double dt = 1.0 / fgGetInt("/sim/model-hz");
+    aircraft_dir = fgGetString("/sim/aircraft-dir");
+    const string &model = fgGetString("/sim/flight-model");
+
+    try {
+	if ( model == "larcsim" ) {
+	    cur_fdm_state = new FGLaRCsim( dt );
+	} else if ( model == "jsb" ) {
+	    cur_fdm_state = new FGJSBsim( dt );
+	} else if ( model == "ada" ) {
+	    cur_fdm_state = new FGADA( dt );
+	} else if ( model == "balloon" ) {
+	    cur_fdm_state = new FGBalloonSim( dt );
+	} else if ( model == "magic" ) {
+	    cur_fdm_state = new FGMagicCarpet( dt );
+	} else if ( model == "ufo" ) {
+	    cur_fdm_state = new FGUFO( dt );
+	} else if ( model == "external" ) {
+	    cur_fdm_state = new FGExternal( dt );
+	} else if ( model.find("network") == 0 ) {
+            string host = "localhost";
+            int port1 = 5501;
+            int port2 = 5502;
+            int port3 = 5503;
+            string net_options = model.substr(8);
+            string::size_type begin, end;
+            begin = 0;
+            // host
+            end = net_options.find( ",", begin );
+            if ( end != string::npos ) {
+                host = net_options.substr(begin, end - begin);
+                begin = end + 1;
+            }
+            // port1
+            end = net_options.find( ",", begin );
+            if ( end != string::npos ) {
+                port1 = atoi( net_options.substr(begin, end - begin).c_str() );
+                begin = end + 1;
+            }
+            // port2
+            end = net_options.find( ",", begin );
+            if ( end != string::npos ) {
+                port2 = atoi( net_options.substr(begin, end - begin).c_str() );
+                begin = end + 1;
+            }
+            // port3
+            end = net_options.find( ",", begin );
+            if ( end != string::npos ) {
+                port3 = atoi( net_options.substr(begin, end - begin).c_str() );
+                begin = end + 1;
+            }
+	    cur_fdm_state = new FGExternalNet( dt, host, port1, port2, port3 );
+	} else if ( model == "null" ) {
+	    cur_fdm_state = new FGNullFDM( dt );
+	} else if ( model == "yasim" ) {
+	    cur_fdm_state = new YASim( dt );
+	} else {
+	    SG_LOG(SG_GENERAL, SG_ALERT,
+		   "Unrecognized flight model '" << model
+		   << "', cannot init flight dynamics model.");
+	    exit(-1);
+	}
+    } catch ( ... ) {
+	SG_LOG(SG_GENERAL, SG_ALERT, "FlightGear aborting\n\n");
+	exit(-1);
+    }
+}
+
+
+// Initialize view parameters
+void fgInitView() {
+  // force update of model so that viewer can get some data...
+  globals->get_aircraft_model()->update(0);
+  // run update for current view so that data is current...
+  globals->get_viewmgr()->update(0);
+}
+
+
+SGTime *fgInitTime() {
+    // Initialize time
+    static const SGPropertyNode *longitude
+	= fgGetNode("/position/longitude-deg");
+    static const SGPropertyNode *latitude
+	= fgGetNode("/position/latitude-deg");
+    static const SGPropertyNode *cur_time_override
+	= fgGetNode("/sim/time/cur-time-override", true);
+
+    SGPath zone( globals->get_fg_root() );
+    zone.append( "Timezone" );
+    SGTime *t = new SGTime( longitude->getDoubleValue()
+                              * SGD_DEGREES_TO_RADIANS,
+                            latitude->getDoubleValue()
+                              * SGD_DEGREES_TO_RADIANS,
+                            zone.str(),
+                            cur_time_override->getLongValue() );
+
+    // Handle potential user specified time offsets
+    time_t cur_time = t->get_cur_time();
+    time_t currGMT = sgTimeGetGMT( gmtime(&cur_time) );
+    time_t systemLocalTime = sgTimeGetGMT( localtime(&cur_time) );
+    time_t aircraftLocalTime = 
+        sgTimeGetGMT( fgLocaltime(&cur_time, t->get_zonename() ) );
+
+    // Okay, we now have six possible scenarios
+    int offset = fgGetInt("/sim/startup/time-offset");
+    const string &offset_type = fgGetString("/sim/startup/time-offset-type");
+    if (offset_type == "system-offset") {
+        globals->set_warp( offset );
+    } else if (offset_type == "gmt-offset") {
+        globals->set_warp( offset - (currGMT - systemLocalTime) );
+    } else if (offset_type == "latitude-offset") {
+        globals->set_warp( offset - (aircraftLocalTime - systemLocalTime) );
+    } else if (offset_type == "system") {
+        globals->set_warp( offset - cur_time );
+    } else if (offset_type == "gmt") {
+        globals->set_warp( offset - currGMT );
+    } else if (offset_type == "latitude") {
+        globals->set_warp( offset - (aircraftLocalTime - systemLocalTime) - 
+                           cur_time ); 
+    } else {
+        SG_LOG( SG_GENERAL, SG_ALERT,
+                "FG_TIME::Unsupported offset type " << offset_type );
+        exit( -1 );
+    }
+
+    SG_LOG( SG_GENERAL, SG_INFO, "After time init, warp = " 
+            << globals->get_warp() );
+
+    globals->set_warp_delta( 0 );
+
+    t->update( 0.0, 0.0,
+               cur_time_override->getLongValue(),
+               globals->get_warp() );
+
+    return t;
+}
+
+
 // This is the top level init routine which calls all the other
 // initialization routines.  If you are adding a subsystem to flight
 // gear, its initialization call should located in this routine.
 // Returns non-zero if a problem encountered.
 bool fgInitSubsystems( void ) {
+    static const SGPropertyNode *longitude
+	= fgGetNode("/position/longitude-deg");
+    static const SGPropertyNode *latitude
+	= fgGetNode("/position/latitude-deg");
+    static const SGPropertyNode *altitude
+	= fgGetNode("/position/altitude-ft");
+
     fgLIGHT *l = &cur_light_params;
 
-    FG_LOG( FG_GENERAL, FG_INFO, "Initialize Subsystems");
-    FG_LOG( FG_GENERAL, FG_INFO, "========== ==========");
+    SG_LOG( SG_GENERAL, SG_INFO, "Initialize Subsystems");
+    SG_LOG( SG_GENERAL, SG_INFO, "========== ==========");
 
-    // Initialize the material property lib
-    FGPath mpath( globals->get_fg_root() );
-    mpath.append( "materials" );
-    if ( material_lib.load( mpath.str() ) ) {
-    } else {
-    	FG_LOG( FG_GENERAL, FG_ALERT, "Error loading material lib!" );
-	exit(-1);
-    }
 
-    // Initialize the Scenery Management subsystem
-    if ( fgSceneryInit() ) {
-	// Material lib initialized ok.
-    } else {
-    	FG_LOG( FG_GENERAL, FG_ALERT, "Error in Scenery initialization!" );
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the material property subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+    SGPath mpath( globals->get_fg_root() );
+    mpath.append( "materials.xml" );
+    if ( ! material_lib.load( 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() ) {
 	// Load the local scenery data
-	global_tile_mgr.update( fgGetDouble("/position/longitude"),
-				fgGetDouble("/position/latitude") );
+	double visibility_meters = fgGetDouble("/environment/visibility-m");
+		
+	global_tile_mgr.update( longitude->getDoubleValue(),
+				latitude->getDoubleValue(),
+				visibility_meters );
     } else {
-    	FG_LOG( FG_GENERAL, FG_ALERT, "Error in Tile Manager initialization!" );
+    	SG_LOG( SG_GENERAL, SG_ALERT, "Error in Tile Manager initialization!" );
 	exit(-1);
     }
 
-    FG_LOG( FG_GENERAL, FG_DEBUG,
+    // cause refresh of viewer scenery timestamps every 15 seconds...
+    global_events.Register( "FGTileMgr::refresh_view_timestamps()",
+			    &global_tile_mgr, &FGTileMgr::refresh_view_timestamps,
+			    15000 );
+
+    SG_LOG( SG_GENERAL, SG_DEBUG,
     	    "Current terrain elevation after tile mgr init " <<
-	    scenery.cur_elev );
+	    globals->get_scenery()->get_cur_elev() );
 
-    double dt = 1.0 / fgGetInt("/sim/model-hz");
-    // cout << "dt = " << dt << endl;
 
-    aircraft_dir = fgGetString("/sim/aircraft-dir");
-    const string &model = fgGetString("/sim/flight-model");
-    if (model == "larcsim") {
-	cur_fdm_state = new FGLaRCsim( dt );
-    } else if (model == "jsb") {
-	cur_fdm_state = new FGJSBsim( dt );
-    } else if (model == "ada") {
-	cur_fdm_state = new FGADA( dt );
-    } else if (model == "balloon") {
-	cur_fdm_state = new FGBalloonSim( dt );
-    } else if (model == "magic") {
-	cur_fdm_state = new FGMagicCarpet( dt );
-    } else if (model == "external") {
-	cur_fdm_state = new FGExternal( dt );
-    } else {
-	FG_LOG(FG_GENERAL, FG_ALERT,
-	       "Unrecognized flight model '" << model
-	       << ", can't init aircraft");
-	exit(-1);
-    }
-    cur_fdm_state->stamp();
-    cur_fdm_state->set_remainder( 0 );
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the flight model subsystem.
+    ////////////////////////////////////////////////////////////////////
 
+    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.
 
-    fgFDMSetGroundElevation( fgGetString("/sim/flight-model"),
-			     scenery.cur_elev );
-    
-    // set the initial position
-    fgInitPosition();
-
-    // Calculate ground elevation at starting point (we didn't have
-    // tmp_abs_view_pos calculated when fgTileMgrUpdate() was called above
-    //
-    // calculalate a cartesian point somewhere along the line between
-    // the center of the earth and our view position.  Doesn't have to
-    // be the exact elevation (this is good because we don't know it
-    // yet :-)
-
-    // now handled inside of the fgTileMgrUpdate()
-
-    // Reset our altitude if we are below ground
-    FG_LOG( FG_GENERAL, FG_DEBUG, "Current altitude = "
-	    << cur_fdm_state->get_Altitude() );
-    FG_LOG( FG_GENERAL, FG_DEBUG, "Current runway altitude = " <<
-	    cur_fdm_state->get_Runway_altitude() );
-
-    if ( cur_fdm_state->get_Altitude() < cur_fdm_state->get_Runway_altitude() +
-	 3.758099) {
-	cur_fdm_state->set_Altitude( cur_fdm_state->get_Runway_altitude() +
-				     3.758099 );
-    }
-
-    FG_LOG( FG_GENERAL, FG_INFO,
-	    "Updated position (after elevation adj): ("
-	    << (cur_fdm_state->get_Latitude() * SGD_RADIANS_TO_DEGREES) << ", "
-	    << (cur_fdm_state->get_Longitude() * SGD_RADIANS_TO_DEGREES) << ", "
-	    << (cur_fdm_state->get_Altitude() * FEET_TO_METER) << ")" );
-
-    // We need to calculate a few sea_level_radius here so we can pass
-    // the correct value to the view class
-    double sea_level_radius_meters;
-    double lat_geoc;
-    sgGeodToGeoc( cur_fdm_state->get_Latitude(),
-		  cur_fdm_state->get_Altitude(),
-		  &sea_level_radius_meters, &lat_geoc);
-    cur_fdm_state->set_Sea_level_radius( sea_level_radius_meters *
-					 METER_TO_FEET );
-
-    // The following section sets up the flight model EOM parameters
-    // and should really be read in from one or more files.
-
-    // Initial Velocity
-    fgVelocityInit();
-
-    // Initial Orientation
-//     cur_fdm_state->
-// 	set_Euler_Angles( fgGetDouble("/orientation/roll") * SGD_DEGREES_TO_RADIANS,
-// 			  fgGetDouble("/orientation/pitch") * SGD_DEGREES_TO_RADIANS,
-// 			  fgGetDouble("/orientation/heading") * SGD_DEGREES_TO_RADIANS );
-
-    // Initialize the event manager
-    global_events.Init();
-
-    // Output event stats every 60 seconds
-    global_events.Register( "fgEVENT_MGR::PrintStats()",
-			    fgMethodCallback<fgEVENT_MGR>( &global_events,
-						   &fgEVENT_MGR::PrintStats),
-			    fgEVENT::FG_EVENT_READY, 60000 );
-
-    // Initialize win_ratio parameters
-    for ( int i = 0; i < globals->get_viewmgr()->size(); ++i ) {
-	globals->get_viewmgr()->get_view(i)->
-	    set_win_ratio( fgGetInt("/sim/startup/xsize") /
-			   fgGetInt("/sim/startup/ysize") );
-    }
 
-    // Initialize pilot view
-    FGViewerRPH *pilot_view =
-	(FGViewerRPH *)globals->get_viewmgr()->get_view( 0 );
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the view manager subsystem.
+    ////////////////////////////////////////////////////////////////////
 
-    pilot_view->set_geod_view_pos( cur_fdm_state->get_Longitude(), 
-				   cur_fdm_state->get_Lat_geocentric(), 
-				   cur_fdm_state->get_Altitude() *
-				   FEET_TO_METER );
-    pilot_view->set_sea_level_radius( cur_fdm_state->get_Sea_level_radius() *
-				      FEET_TO_METER ); 
-    pilot_view->set_rph( cur_fdm_state->get_Phi(),
-			 cur_fdm_state->get_Theta(),
-			 cur_fdm_state->get_Psi() );
+    fgInitView();
 
-    // set current view to 0 (first) which is our main pilot view
-    globals->set_current_view( pilot_view );
 
-    FG_LOG( FG_GENERAL, FG_DEBUG, "  abs_view_pos = "
-	    << globals->get_current_view()->get_abs_view_pos());
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the lighting 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,
-			    fgEVENT::FG_EVENT_READY, 60000);
-    global_events.Register( "fgUpdateMoonPos()", fgUpdateMoonPos,
-			    fgEVENT::FG_EVENT_READY, 60000);
+    global_events.Register( "fgUpdateSunPos()", &fgUpdateSunPos,
+			    60000);
+    global_events.Register( "fgUpdateMoonPos()", &fgUpdateMoonPos,
+			    60000);
 
     // Initialize Lighting interpolation tables
     l->Init();
 
+    // force one lighting update to make it right to start with...
+    l->Update();
     // update the lighting parameters (based on sun angle)
     global_events.Register( "fgLight::Update()",
-			    fgMethodCallback<fgLIGHT>( &cur_light_params,
-						       &fgLIGHT::Update),
-			    fgEVENT::FG_EVENT_READY, 30000 );
+			    &cur_light_params, &fgLIGHT::Update,
+			    30000 );
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the logger.
+    ////////////////////////////////////////////////////////////////////
+    
+    globals->set_logger(new FGLogger);
+    globals->get_logger()->init();
+    globals->get_logger()->bind();
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the local time subsystem.
+    ////////////////////////////////////////////////////////////////////
+
     // update the current timezone each 30 minutes
-    global_events.Register( "fgUpdateLocalTime()", fgUpdateLocalTime,
-			    fgEVENT::FG_EVENT_READY, 1800000);
+    global_events.Register( "fgUpdateLocalTime()", &fgUpdateLocalTime,
+			    30*60*1000 );
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the weather subsystem.
+    ////////////////////////////////////////////////////////////////////
 
     // Initialize the weather modeling subsystem
-#ifndef FG_OLD_WEATHER
+#ifdef FG_WEATHERCM
     // Initialize the WeatherDatabase
-    FG_LOG(FG_GENERAL, FG_INFO, "Creating LocalWeatherDatabase");
+    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() * FEET_TO_METER );
-    FGLocalWeatherDatabase::theFGLocalWeatherDatabase = 
+	       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() );
+				    globals->get_fg_root(),
+                                    working_type );
+    }
+
     // cout << theFGLocalWeatherDatabase << endl;
     // cout << "visibility = " 
     //      << theFGLocalWeatherDatabase->getWeatherVisibility() << endl;
 
     WeatherDatabase = FGLocalWeatherDatabase::theFGLocalWeatherDatabase;
-    
-    double init_vis = fgGetDouble("/environment/visibility");
-    if ( init_vis > 0 ) {
-	WeatherDatabase->setWeatherVisibility( init_vis );
-    }
 
     // register the periodic update of the weather
-    global_events.Register( "weather update", fgUpdateWeatherDatabase,
-                            fgEVENT::FG_EVENT_READY, 30000);
+    global_events.Register( "weather update", &fgUpdateWeatherDatabase,
+                            30000);
 #else
-    current_weather.Init();
+    globals->get_environment_mgr()->init();
+    globals->get_environment_mgr()->bind();
 #endif
 
+    ////////////////////////////////////////////////////////////////////
     // Initialize vor/ndb/ils/fix list management and query systems
-    FG_LOG(FG_GENERAL, FG_INFO, "Loading Navaids");
+    ////////////////////////////////////////////////////////////////////
 
-    FG_LOG(FG_GENERAL, FG_INFO, "  VOR/NDB");
+    SG_LOG(SG_GENERAL, SG_INFO, "Loading Navaids");
+
+    SG_LOG(SG_GENERAL, SG_INFO, "  VOR/NDB");
     current_navlist = new FGNavList;
-    FGPath p_nav( globals->get_fg_root() );
+    SGPath p_nav( globals->get_fg_root() );
     p_nav.append( "Navaids/default.nav" );
     current_navlist->init( p_nav );
 
-    FG_LOG(FG_GENERAL, FG_INFO, "  ILS and Marker Beacons");
+    SG_LOG(SG_GENERAL, SG_INFO, "  ILS and Marker Beacons");
     current_beacons = new FGMarkerBeacons;
     current_beacons->init();
     current_ilslist = new FGILSList;
-    FGPath p_ils( globals->get_fg_root() );
+    SGPath p_ils( globals->get_fg_root() );
     p_ils.append( "Navaids/default.ils" );
     current_ilslist->init( p_ils );
 
-    FG_LOG(FG_GENERAL, FG_INFO, "  Fixes");
+    SG_LOG(SG_GENERAL, SG_INFO, "  Fixes");
     current_fixlist = new FGFixList;
-    FGPath p_fix( globals->get_fg_root() );
+    SGPath p_fix( globals->get_fg_root() );
     p_fix.append( "Navaids/default.fix" );
     current_fixlist->init( p_fix );
 
-    // Radio stack subsystem.
+    ////////////////////////////////////////////////////////////////////
+    // Initialize ATC list management and query systems
+    ////////////////////////////////////////////////////////////////////
+
+    SG_LOG(SG_GENERAL, SG_INFO, "  ATIS");
+    current_atislist = new FGATISList;
+    SGPath p_atis( globals->get_fg_root() );
+    p_atis.append( "ATC/default.atis" );
+    current_atislist->init( p_atis );
+
+    SG_LOG(SG_GENERAL, SG_INFO, "  Tower");
+    current_towerlist = new FGTowerList;
+    SGPath p_tower( globals->get_fg_root() );
+    p_tower.append( "ATC/default.tower" );
+    current_towerlist->init( p_tower );
+
+    SG_LOG(SG_GENERAL, SG_INFO, "  Approach");
+    current_approachlist = new FGApproachList;
+    SGPath p_approach( globals->get_fg_root() );
+    p_approach.append( "ATC/default.approach" );
+    current_approachlist->init( p_approach );
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialise ATC display system
+    ////////////////////////////////////////////////////////////////////
+
+    SG_LOG(SG_GENERAL, SG_INFO, "  ATC Display");
+    globals->set_ATC_display(new FGATCDisplay);
+    globals->get_ATC_display()->init(); 
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialise the ATC Manager 
+    ////////////////////////////////////////////////////////////////////
+
+    SG_LOG(SG_GENERAL, SG_INFO, "  ATC Manager");
+    globals->set_ATC_mgr(new FGATCMgr);
+    globals->get_ATC_mgr()->init(); 
+    
+    ////////////////////////////////////////////////////////////////////
+    // Initialise the AI Manager 
+    ////////////////////////////////////////////////////////////////////
+
+    SG_LOG(SG_GENERAL, SG_INFO, "  AI Manager");
+    // globals->set_AI_mgr(new FGAIMgr);
+    // globals->get_AI_mgr()->init();     
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the built-in commands.
+    ////////////////////////////////////////////////////////////////////
+    fgInitCommands();
+
+
+#ifdef ENABLE_AUDIO_SUPPORT
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the sound subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+    globals->set_soundmgr(new FGSoundMgr);
+    globals->get_soundmgr()->init();
+    globals->get_soundmgr()->bind();
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the sound-effects subsystem.
+    ////////////////////////////////////////////////////////////////////
+    globals->set_fx(new FGFX);
+    globals->get_fx()->init();
+    globals->get_fx()->bind();
+
+#endif
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the radio stack subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+				// A textbook example of how FGSubsystem
+				// should work...
     current_radiostack = new FGRadioStack;
     current_radiostack->init();
     current_radiostack->bind();
 
-    // Initialize the Cockpit subsystem
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the cockpit subsystem
+    ////////////////////////////////////////////////////////////////////
+
     if( fgCockpitInit( &current_aircraft )) {
 	// Cockpit initialized ok.
     } else {
-    	FG_LOG( FG_GENERAL, FG_ALERT, "Error in Cockpit initialization!" );
+    	SG_LOG( SG_GENERAL, SG_ALERT, "Error in Cockpit initialization!" );
 	exit(-1);
     }
 
-    // Initialize the flight model subsystem data structures base on
-    // above values
-
-    cur_fdm_state->init();
-    cur_fdm_state->bind();
-//     if ( cur_fdm_state->init( 1.0 / fgGetInt("/sim/model-hz") ) ) {
-// 	// fdm init successful
-//     } else {
-// 	FG_LOG( FG_GENERAL, FG_ALERT, "FDM init() failed!  Cannot continue." );
-// 	exit(-1);
-//     }
-
-    // *ABCD* I'm just sticking this here for now, it should probably
-    // move eventually
-    scenery.cur_elev = cur_fdm_state->get_Runway_altitude() * FEET_TO_METER;
-
-    if ( cur_fdm_state->get_Altitude() <
-	 cur_fdm_state->get_Runway_altitude() + 3.758099)
-    {
-	cur_fdm_state->set_Altitude( cur_fdm_state->get_Runway_altitude() +
-				     3.758099 );
-    }
 
-    FG_LOG( FG_GENERAL, FG_INFO,
-	    "Updated position (after elevation adj): ("
-	    << (cur_fdm_state->get_Latitude() * SGD_RADIANS_TO_DEGREES) << ", "
-	    << (cur_fdm_state->get_Longitude() * SGD_RADIANS_TO_DEGREES) << ", "
-	    << (cur_fdm_state->get_Altitude() * FEET_TO_METER) << ")" );
-    // *ABCD* end of thing that I just stuck in that I should probably
-    // move
-
-    // Joystick support
-    if ( ! fgJoystickInit() ) {
-    	FG_LOG( FG_GENERAL, FG_ALERT, "Error in Joystick initialization!" );
-    }
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the autopilot subsystem.
+    ////////////////////////////////////////////////////////////////////
 
-    // Autopilot init
-    current_autopilot = new FGAutopilot;
-    current_autopilot->init();
+    globals->set_autopilot(new FGAutopilot);
+    globals->get_autopilot()->init();
+    globals->get_autopilot()->bind();
 
-    // initialize the gui parts of the autopilot
+				// FIXME: these should go in the
+				// GUI initialization code, not here.
+    fgAPAdjustInit();
     NewTgtAirportInit();
-    fgAPAdjustInit() ;
     NewHeadingInit();
     NewAltitudeInit();
 
-    // Initialize I/O channels
+    ////////////////////////////////////////////////////////////////////
+    // Initialize I/O subsystem.
+    ////////////////////////////////////////////////////////////////////
+
 #if ! defined( macintosh )
     fgIOInit();
 #endif
@@ -825,21 +1037,43 @@ bool fgInitSubsystems( void ) {
 				    "Panels/Default/default.xml");
     current_panel = fgReadPanel(panel_path);
     if (current_panel == 0) {
-	FG_LOG( FG_INPUT, FG_ALERT, 
+	SG_LOG( SG_INPUT, SG_ALERT, 
 		"Error reading new panel from " << panel_path );
     } else {
-	FG_LOG( FG_INPUT, FG_INFO, "Loaded new panel from " << panel_path );
+	SG_LOG( SG_INPUT, SG_INFO, "Loaded new panel from " << panel_path );
 	current_panel->init();
 	current_panel->bind();
     }
 
-    // Initialize the BFI
-    FGBFI::init();
+    
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the default (kludged) properties.
+    ////////////////////////////////////////////////////////////////////
+
+    fgInitProps();
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the controls subsystem.
+    ////////////////////////////////////////////////////////////////////
 
-    controls.init();
-    controls.bind();
+    globals->get_controls()->init();
+    globals->get_controls()->bind();
 
-    FG_LOG( FG_GENERAL, FG_INFO, endl);
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the input subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+    current_input.init();
+    current_input.bind();
+
+
+    ////////////////////////////////////////////////////////////////////////
+    // End of subsystem initialization.
+    ////////////////////////////////////////////////////////////////////
+
+    SG_LOG( SG_GENERAL, SG_INFO, endl);
 
 				// Save the initial state for future
 				// reference.
@@ -851,104 +1085,49 @@ bool fgInitSubsystems( void ) {
 
 void fgReInitSubsystems( void )
 {
-    FG_LOG( FG_GENERAL, FG_INFO,
-	    "/position/altitude = " << fgGetDouble("/position/altitude") );
-
-    bool freeze = globals->get_freeze();
-    if( !freeze )
-        globals->set_freeze( true );
+    static const SGPropertyNode *longitude
+	= fgGetNode("/position/longitude-deg");
+    static const SGPropertyNode *latitude
+	= fgGetNode("/position/latitude-deg");
+    static const SGPropertyNode *altitude
+	= fgGetNode("/position/altitude-ft");
+    static const SGPropertyNode *master_freeze
+	= fgGetNode("/sim/freeze/master");
+
+    SG_LOG( SG_GENERAL, SG_INFO,
+	    "/position/altitude = " << altitude->getDoubleValue() );
+
+    bool freeze = master_freeze->getBoolValue();
+    if ( !freeze ) {
+	fgSetBool("/sim/freeze/master", true);
+    }
     
     // Initialize the Scenery Management subsystem
-    if ( ! fgSceneryInit() ) {
-    	FG_LOG( FG_GENERAL, FG_ALERT, "Error in Scenery initialization!" );
-	exit(-1);
-    }
-
-    if( global_tile_mgr.init() ) {
-	// Load the local scenery data
-	global_tile_mgr.update( fgGetDouble("/position/longitude"),
-				fgGetDouble("/position/latitude") );
-    } else {
-    	FG_LOG( FG_GENERAL, FG_ALERT, "Error in Tile Manager initialization!" );
-		exit(-1);
-    }
-
-    // cout << "current scenery elev = " << scenery.cur_elev << endl;
-
-    fgFDMSetGroundElevation( fgGetString("/sim/flight-model"), 
-			     scenery.cur_elev );
-    fgInitPosition();
-
-    // Reset our altitude if we are below ground
-    FG_LOG( FG_GENERAL, FG_DEBUG, "Current altitude = "
-	    << cur_fdm_state->get_Altitude() );
-    FG_LOG( FG_GENERAL, FG_DEBUG, "Current runway altitude = "
-	    << cur_fdm_state->get_Runway_altitude() );
-
-    if ( cur_fdm_state->get_Altitude() <
-	 cur_fdm_state->get_Runway_altitude() + 3.758099)
-    {
-	cur_fdm_state->set_Altitude( cur_fdm_state->get_Runway_altitude() +
-				     3.758099 );
-    }
-    double sea_level_radius_meters;
-    double lat_geoc;
-    sgGeodToGeoc( cur_fdm_state->get_Latitude(), cur_fdm_state->get_Altitude(), 
-		  &sea_level_radius_meters, &lat_geoc);
-    cur_fdm_state->set_Sea_level_radius( sea_level_radius_meters *
-					 METER_TO_FEET );
-	
-    // The following section sets up the flight model EOM parameters
-    // and should really be read in from one or more files.
-
-    // Initial Velocity
-    fgVelocityInit();
-
-    // Initial Orientation
-//     cur_fdm_state->
-// 	set_Euler_Angles( fgGetDouble("/orientation/roll") * SGD_DEGREES_TO_RADIANS,
-// 			  fgGetDouble("/orientation/pitch") * SGD_DEGREES_TO_RADIANS,
-// 			  fgGetDouble("/orientation/heading") * SGD_DEGREES_TO_RADIANS );
-
-    // Initialize view parameters
-    FGViewerRPH *pilot_view =
-	(FGViewerRPH *)globals->get_viewmgr()->get_view( 0 );
+    // FIXME, what really needs to get initialized here, at the time
+    // this was commented out, scenery.init() was a noop
+    // scenery.init();
 
-    pilot_view->set_view_offset( 0.0 );
-    pilot_view->set_goal_view_offset( 0.0 );
-
-    pilot_view->set_geod_view_pos( cur_fdm_state->get_Longitude(), 
-				   cur_fdm_state->get_Lat_geocentric(), 
-				   cur_fdm_state->get_Altitude() *
-				   FEET_TO_METER );
-    pilot_view->set_sea_level_radius( cur_fdm_state->get_Sea_level_radius() *
-				      FEET_TO_METER ); 
-    pilot_view->set_rph( cur_fdm_state->get_Phi(),
-			 cur_fdm_state->get_Theta(),
-			 cur_fdm_state->get_Psi() );
+    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.
 
-    // set current view to 0 (first) which is our main pilot view
-    globals->set_current_view( pilot_view );
+    // copy viewer settings into current-view path
+    globals->get_viewmgr()->copyToCurrent();
 
-    FG_LOG( FG_GENERAL, FG_DEBUG, "  abs_view_pos = "
-	    << globals->get_current_view()->get_abs_view_pos());
+    fgInitView();
 
-    cur_fdm_state->init();
-//     cur_fdm_state->bind();
-//     cur_fdm_state->init( 1.0 / fgGetInt("/sim/model-hz") );
+    globals->get_controls()->reset_all();
+    globals->get_autopilot()->reset();
 
-    scenery.cur_elev = cur_fdm_state->get_Runway_altitude() * FEET_TO_METER;
+    fgUpdateSunPos();
+    fgUpdateMoonPos();
+    cur_light_params.Update();
+    fgUpdateLocalTime();
 
-    if ( cur_fdm_state->get_Altitude() <
-	 cur_fdm_state->get_Runway_altitude() + 3.758099)
-    {
-	cur_fdm_state->set_Altitude( cur_fdm_state->get_Runway_altitude() +
-				     3.758099 );
+    if ( !freeze ) {
+	fgSetBool("/sim/freeze/master", false);
     }
-
-    controls.reset_all();
-    current_autopilot->reset();
-
-    if( !freeze )
-        globals->set_freeze( false );
 }
+