X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Foptions.cxx;h=1073c5635472bf8ffa5ede6c2b1f25ffdbe52eb9;hb=2cd7473384ec231e2a013b280e83919b98ed2a15;hp=826dfe621862cf14d10ca4f354b5a89f09af4556;hpb=8d903eac1c5fd761c5f14606d747fac23030b2b1;p=flightgear.git

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 826dfe621..1073c5635 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -25,11 +25,7 @@
 #  include <config.h>
 #endif
 
-#if defined(FX) && defined(XMESA)
-bool global_fullscreen = true;
-#endif
-
-#include <Include/compiler.h>
+#include <simgear/compiler.h>
 
 #include <math.h>            // rint()
 #include <stdio.h>
@@ -38,27 +34,36 @@ bool global_fullscreen = true;
 
 #include STL_STRING
 
-#include <Include/fg_constants.h>
-#include <Include/general.hxx>
-#include <Cockpit/cockpit.hxx>
-#include <Debug/logstream.hxx>
-#include <FDM/flight.hxx>
-#include <Misc/fgstream.hxx>
+#include <simgear/misc/fgstream.hxx>
+
+// #include <Include/general.hxx>
+// #include <Airports/simple.hxx>
+// #include <Cockpit/cockpit.hxx>
+// #include <FDM/flight.hxx>
+// #include <FDM/UIUCModel/uiuc_aircraftdir.h>
 #ifdef FG_NETWORK_OLK
-#  include <Network/network.h>
+#  include <NetworkOLK/network.h>
 #endif
-#include <Time/fg_time.hxx>
 
+#include "globals.hxx"
+#include "fg_init.hxx"
+#include "fg_props.hxx"
 #include "options.hxx"
-#include "fg_serial.hxx"
 
 FG_USING_STD(string);
 FG_USING_NAMESPACE(std);
 
-// from GLUTmain.cxx
-extern void fgReshape( int width, int height );
 
-inline double
+#define NEW_DEFAULT_MODEL_HZ 120
+
+enum
+{
+    FG_OPTIONS_OK = 0,
+    FG_OPTIONS_HELP = 1,
+    FG_OPTIONS_ERROR = 2
+};
+
+static double
 atof( const string& str )
 {
 
@@ -70,7 +75,7 @@ atof( const string& str )
 #endif
 }
 
-inline int
+static int
 atoi( const string& str )
 {
 #ifdef __MWERKS__ 
@@ -81,172 +86,101 @@ atoi( const string& str )
 #endif
 }
 
-// Defined the shared options class here
-fgOPTIONS current_options;
-
-
-// Constructor
-fgOPTIONS::fgOPTIONS() :
-    // starting longitude in degrees (west = -)
-    // starting latitude in degrees (south = -)
-
-    // Default initial position is Globe, AZ (P13)
-    lon(-110.6642444),
-    lat(  33.3528917),
-
-    // North of the city of Globe
-    // lon(-110.7),
-    // lat(  33.4),
-
-    // North of the city of Globe
-    // lon(-110.742578),
-    // lat(  33.507122),
-
-    // Near where I used to live in Globe, AZ
-    // lon(-110.766000),
-    // lat(  33.377778),
-
-    // 10125 Jewell St. NE
-    // lon(-93.15),
-    // lat( 45.15),
-
-    // Near KHSP (Hot Springs, VA)
-    // lon(-79.8338964 + 0.01),
-    // lat( 37.9514564 + 0.008),
-
-    // (SEZ) SEDONA airport
-    // lon(-111.7884614 + 0.01),
-    // lat(  34.8486289 - 0.015),
-
-    // Jim Brennon's Kingmont Observatory
-    // lon(-121.1131667),
-    // lat(  38.8293917),
-
-    // Huaras, Peru (S09d 31.871'  W077d 31.498')
-    // lon(-77.5249667),
-    // lat( -9.5311833),
- 
-    // Eclipse Watching w73.5 n10 (approx) 18:00 UT
-    // lon(-73.5),
-    // lat( 10.0),
-
-    // Timms Hill (WI)
-    // lon(-90.1953055556),
-    // lat( 45.4511388889),
-
-    // starting altitude in meters (this will be reset to ground level
-    // if it is lower than the terrain
-    altitude(-9999.0),
-
-    // Initial Orientation
-    heading(270.0),      // heading (yaw) angle in degress (Psi)
-    roll(0.0),           // roll angle in degrees (Phi)
-    pitch(0.424),        // pitch angle in degrees (Theta)
-
-    // Initialize current options velocities to 0.0
-    uBody(0.0), vBody(0.0), wBody(0.0),
-
-    // Miscellaneous
-    game_mode(0),
-    splash_screen(1),
-    intro_music(1),
-    mouse_pointer(0),
-    pause(0),
-    control_mode(FG_JOYSTICK),
-
-    // Features
-    hud_status(1),
-    panel_status(0),
-    sound(1),
-
-    // Flight Model options
-    flight_model( FGInterface::FG_LARCSIM ),
-    model_hz( NEW_DEFAULT_MODEL_HZ ),
-    speed_up( 1 ),
-
-    // Rendering options
-    fog(FG_FOG_NICEST),  // nicest
-    fov(55.0),
-    fullscreen(0),
-    shading(1),
-    skyblend(1),
-    textures(1),
-    wireframe(0),
-    xsize(640),
-    ysize(480),
-
-    // Scenery options
-    tile_diameter(5),
-
-    // HUD options
-    units(FG_UNITS_FEET),
-    tris_or_culled(0),
-	
-    // Time options
-    time_offset(0),
-    start_gst(0),
-    start_lst(0)
 
+/**
+ * Set a few fail-safe default property values.
+ *
+ * These should all be set in $FG_ROOT/preferences.xml, but just
+ * in case, we provide some initial sane values here. This method 
+ * should be invoked *before* reading any init files.
+ */
+void
+fgSetDefaults ()
 {
-    // set initial values/defaults
-    char* envp = ::getenv( "FG_ROOT" );
+    // set a possibly independent location for scenery data
+    char *envp = ::getenv( "FG_SCENERY" );
 
     if ( envp != NULL ) {
 	// fg_root could be anywhere, so default to environmental
 	// variable $FG_ROOT if it is set.
-	fg_root = envp;
+        globals->set_fg_scenery(envp);
     } else {
-	// Otherwise, default to a random compiled in location if
-	// $FG_ROOT is not set.  This can still be overridden from the
-	// command line or a config file.
-
-#if defined( WIN32 )
-	fg_root = "\\FlightGear";
-#elif defined( MACOS )
-	fg_root = "";
-#else
-	fg_root = PKGLIBDIR;
-#endif
+	// Otherwise, default to Scenery being in $FG_ROOT/Scenery
+	globals->set_fg_scenery("");
     }
+				// Position (Globe, AZ)
+    fgSetDouble("/position/longitude", -110.6642444);
+    fgSetDouble("/position/latitude", 33.3528917);
+    fgSetDouble("/position/altitude", -9999.0);
+
+				// Orientation
+    fgSetDouble("/orientation/heading", 270);
+    fgSetDouble("/orientation/roll", 0);
+    fgSetDouble("/orientation/pitch", 0.424);
+
+				// Velocities
+    fgSetString("/sim/startup/speed-set", "knots");
+    fgSetDouble("/velocities/uBody", 0.0);
+    fgSetDouble("/velocities/vBody", 0.0);
+    fgSetDouble("/velocities/wBody", 0.0);
+    fgSetDouble("/velocities/speed-north", 0.0);
+    fgSetDouble("/velocities/speed-east", 0.0);
+    fgSetDouble("/velocities/speed-down", 0.0);
+    fgSetDouble("/velocities/airspeed", 0.0);
+    fgSetDouble("/velocities/mach", 0.0);
+
+				// Miscellaneous
+    fgSetBool("/sim/startup/game-mode", false);
+    fgSetBool("/sim/startup/splash-screen", true);
+    fgSetBool("/sim/startup/intro-music", true);
+    fgSetString("/sim/startup/mouse-pointer", "disabled");
+    fgSetString("/sim/control-mode", "joystick");
+    fgSetBool("/sim/auto-coordination", false);
+
+				// Features
+    fgSetBool("/sim/hud/visibility", false);
+    fgSetBool("/sim/panel/visibility", true);
+    fgSetBool("/sim/sound", true);
+    fgSetBool("/sim/hud/antialiased", false);
+
+				// Flight Model options
+    fgSetString("/sim/flight-model", "larcsim");
+    fgSetString("/sim/aircraft", "c172");
+    fgSetInt("/sim/model-hz", NEW_DEFAULT_MODEL_HZ);
+    fgSetInt("/sim/speed-up", 1);
+    fgSetBool("/sim/startup/trim", false);
+    fgSetBool("/sim/startup/onground", true);
+
+				// Rendering options
+    fgSetString("/sim/rendering/fog", "nicest");
+    fgSetBool("/environment/clouds/status", true);
+    fgSetDouble("/environment/clouds/altitude", 5000);
+    fgSetBool("/sim/startup/fullscreen", false);
+    fgSetBool("/sim/rendering/shading", true);
+    fgSetBool("/sim/rendering/skyblend", true);
+    fgSetBool("/sim/rendering/textures", true);
+    fgSetBool("/sim/rendering/wireframe", false);
+    fgSetInt("/sim/startup/xsize", 800);
+    fgSetInt("/sim/startup/ysize", 600);
+    fgSetInt("/sim/rendering/bits-per-pixel", 16);
+    fgSetString("/sim/view-mode", "pilot");
+    fgSetDouble("/sim/startup/view-offset", 0);
+    fgSetDouble("/environment/visibility", 20000);
+
+				// HUD options
+    fgSetString("/sim/startup/units", "feet");
+    fgSetString("/sim/hud/frame-stat-type", "tris");
+	
+				// Time options
+    fgSetInt("/sim/startup/time-offset", 0);
+    fgSetString("/sim/startup/time-offset-type", "system-offset");
 
-    airport_id = "";		// default airport id
-    net_id = "Johnney";		// default pilot's name
-
-    // initialize port config string list
-    port_options_list.erase ( port_options_list.begin(), 
-			      port_options_list.end() );
+    fgSetBool("/sim/networking/network-olk", false);
+    fgSetString("/sim/networking/call-sign", "Johnny");
 }
 
-void 
-fgOPTIONS::toggle_panel() {
-    
-    FGTime *t = FGTime::cur_time_params;
-    
-    int toggle_pause = t->getPause();
-    
-    if( !toggle_pause )
-        t->togglePauseMode();
-    
-    if( panel_status ) {
-	panel_status = false;
-    } else {
-	panel_status = true;
-    }
-    if ( panel_status ) {
-	if( FGPanel::OurPanel == 0)
-	    new FGPanel;
-	fov *= 0.4232;
-    } else {
-	fov *= (1.0 / 0.4232);
-    }
-    fgReshape( xsize, ysize);
-    
-    if( !toggle_pause )
-        t->togglePauseMode();
-}
-
-double
-fgOPTIONS::parse_time(const string& time_in) {
+static double
+parse_time(const string& time_in) {
     char *time_str, num[256];
     double hours, minutes, seconds;
     double result = 0.0;
@@ -324,7 +258,8 @@ fgOPTIONS::parse_time(const string& time_in) {
 }
 
 
-long int fgOPTIONS::parse_date( const string& date)
+static long int 
+parse_date( const string& date)
 {
     struct tm gmt;
     char * date_str, num[256];
@@ -336,7 +271,7 @@ long int fgOPTIONS::parse_date( const string& date)
     gmt.tm_mday = 0;
     gmt.tm_mon = 0;
     gmt.tm_year = 0;
-    gmt.tm_isdst = 0; // ignore daylight savingtime for the moment
+    gmt.tm_isdst = 0; // ignore daylight savings time for the moment
     date_str = (char *)date.c_str();
     // get year
     if ( strlen(date_str) ) {
@@ -422,12 +357,8 @@ long int fgOPTIONS::parse_date( const string& date)
 	num[i] = '\0';
 	gmt.tm_sec = atoi(num);
     }
-    time_t theTime = FGTime::cur_time_params->get_gmt(gmt.tm_year,
-                                                      gmt.tm_mon,
-						      gmt.tm_mday,
-						      gmt.tm_hour,
-						      gmt.tm_min,
-						      gmt.tm_sec);
+    time_t theTime = sgTimeGetGMT( gmt.tm_year, gmt.tm_mon, gmt.tm_mday,
+				   gmt.tm_hour, gmt.tm_min, gmt.tm_sec );
     //printf ("Date is %s\n", ctime(&theTime));
     //printf ("in seconds that is %d\n", theTime);
     //exit(1);
@@ -435,21 +366,9 @@ long int fgOPTIONS::parse_date( const string& date)
 }
 
 
-// parse degree in the form of [+/-]hhh:mm:ss
-void fgOPTIONS::parse_control( const string& mode ) {
-    if ( mode == "joystick" ) {
-	control_mode = FG_JOYSTICK;
-    } else if ( mode == "mouse" ) {
-	control_mode = FG_MOUSE;
-    } else {
-	control_mode = FG_KEYBOARD;
-    }
-}
-
-
 /// parse degree in the form of [+/-]hhh:mm:ss
-double
-fgOPTIONS::parse_degree( const string& degree_str) {
+static double
+parse_degree( const string& degree_str) {
     double result = parse_time( degree_str );
 
     // printf("Degree = %.4f\n", result);
@@ -459,8 +378,8 @@ fgOPTIONS::parse_degree( const string& degree_str) {
 
 
 // parse time offset command line option
-int
-fgOPTIONS::parse_time_offset( const string& time_str) {
+static int
+parse_time_offset( const string& time_str) {
     int result;
 
     // printf("time offset = %s\n", time_str);
@@ -477,210 +396,314 @@ fgOPTIONS::parse_time_offset( const string& time_str) {
 }
 
 
-// Parse --tile-diameter=n type option 
-
-int
-fgOPTIONS::parse_tile_radius( const string& arg ) {
-    int radius = atoi( arg );
-
-    if ( radius < FG_RADIUS_MIN ) { radius = FG_RADIUS_MIN; }
-    if ( radius > FG_RADIUS_MAX ) { radius = FG_RADIUS_MAX; }
-
-    // printf("parse_tile_radius(): radius = %d\n", radius);
-
-    return(radius);
-}
-
-
-// Parse --fdm=abcdefg type option 
-int
-fgOPTIONS::parse_fdm( const string& fm ) {
-    // printf("fdm = %s\n", fm);
-
-    if ( fm == "slew" ) {
-	return FGInterface::FG_SLEW;
-    } else if ( fm == "jsb" ) {
-	return FGInterface::FG_JSBSIM;
-    } else if ( (fm == "larcsim") || (fm == "LaRCsim") ) {
-	return FGInterface::FG_LARCSIM;
-    } else if ( fm == "external" ) {
-	return FGInterface::FG_EXTERNAL;
-    } else {
-	FG_LOG( FG_GENERAL, FG_ALERT, "Unknown fdm = " << fm );
-	exit(-1);
-    }
-
-    // we'll never get here, but it makes the compiler happy.
-    return -1;
-}
-
-
 // Parse --fov=x.xx type option 
-double
-fgOPTIONS::parse_fov( const string& arg ) {
+static double
+parse_fov( const string& arg ) {
     double fov = atof(arg);
 
     if ( fov < FG_FOV_MIN ) { fov = FG_FOV_MIN; }
     if ( fov > FG_FOV_MAX ) { fov = FG_FOV_MAX; }
 
+    fgSetDouble("/sim/field-of-view", fov);
+
     // printf("parse_fov(): result = %.4f\n", fov);
 
-    return(fov);
+    return fov;
 }
 
 
-// Parse serial port option --serial=/dev/ttyS1,nmea,4800,out
+// Parse I/O channel option
+//
+// Format is "--protocol=medium,direction,hz,medium_options,..."
+//
+//   protocol = { native, nmea, garmin, fgfs, rul, pve, etc. }
+//   medium = { serial, socket, file, etc. }
+//   direction = { in, out, bi }
+//   hz = number of times to process channel per second (floating
+//        point values are ok.
 //
-// Format is "--serial=device,format,baud,direction" where
+// Serial example "--nmea=serial,dir,hz,device,baud" where
 // 
-//  device = OS device name to be open()'ed
-//  format = {nmea, garmin,fgfs,rul}
+//  device = OS device name of serial line to be open()'ed
 //  baud = {300, 1200, 2400, ..., 230400}
-//  direction = {in, out, bi}
+//
+// Socket exacmple "--native=socket,dir,hz,machine,port,style" where
+// 
+//  machine = machine name or ip address if client (leave empty if server)
+//  port = port, leave empty to let system choose
+//  style = tcp or udp
+//
+// File example "--garmin=file,dir,hz,filename" where
+// 
+//  filename = file system file name
+
+static bool 
+parse_channel( const string& type, const string& channel_str ) {
+    // cout << "Channel string = " << channel_str << endl;
 
-bool 
-fgOPTIONS::parse_serial( const string& serial_str ) {
-    string::size_type pos;
+    globals->get_channel_options_list()->push_back( type + "," + channel_str );
+
+    return true;
+}
 
-    // cout << "Serial string = " << serial_str << endl;
 
-    // a flailing attempt to see if the port config string has a
-    // chance at being valid
-    pos = serial_str.find(",");
-    if ( pos == string::npos ) {
-	FG_LOG( FG_GENERAL, FG_ALERT, 
-		"Malformed serial port configure string" );
+// Parse --wp=ID[,alt]
+static bool 
+parse_wp( const string& arg ) {
+    string id, alt_str;
+    double alt = 0.0;
+
+    int pos = arg.find( "@" );
+    if ( pos != string::npos ) {
+	id = arg.substr( 0, pos );
+	alt_str = arg.substr( pos + 1 );
+	// cout << "id str = " << id << "  alt str = " << alt_str << endl;
+	alt = atof( alt_str.c_str() );
+	if ( fgGetString("/sim/startup/units") == "feet" ) {
+	    alt *= FEET_TO_METER;
+	}
+    } else {
+	id = arg;
+    }
+
+    FGAirport a;
+    if ( fgFindAirportID( id, &a ) ) {
+	SGWayPoint wp( a.longitude, a.latitude, alt, SGWayPoint::WGS84, id );
+	globals->get_route()->add_waypoint( wp );
+
+	return true;
+    } else {
 	return false;
     }
-    
-    port_options_list.push_back( serial_str );
+}
+
+
+// Parse --flight-plan=[file]
+static bool 
+parse_flightplan(const string& arg)
+{
+    fg_gzifstream infile(arg.c_str());
+    if (!infile) {
+	return false;
+    }
+    while ( true ) {
+	string line;
+#ifdef GETLINE_NEEDS_TERMINATOR
+	getline( infile, line, '\n' );
+#elif defined( macintosh )
+	getline( infile, line, '\r' );
+#else
+	getline( infile, line );
+#endif
+	if ( infile.eof() ) {
+	    break;
+	}
+	parse_wp(line);
+    }
 
     return true;
 }
 
 
 // Parse a single option
-int fgOPTIONS::parse_option( const string& arg ) {
+static int 
+parse_option (const string& arg) 
+{
     // General Options
     if ( (arg == "--help") || (arg == "-h") ) {
 	// help/usage request
 	return(FG_OPTIONS_HELP);
     } else if ( arg == "--disable-game-mode") {
-	game_mode = false;
+	fgSetBool("/sim/startup/game-mode", false);
     } else if ( arg == "--enable-game-mode" ) {
-	game_mode = true;
+	fgSetBool("/sim/startup/game-mode", true);
     } else if ( arg == "--disable-splash-screen" ) {
-	splash_screen = false;
+	fgSetBool("/sim/startup/splash-screen", false); 
     } else if ( arg == "--enable-splash-screen" ) {
-	splash_screen = true;
+        fgSetBool("/sim/startup/splash-screen", true);
     } else if ( arg == "--disable-intro-music" ) {
-	intro_music = false;
+	fgSetBool("/sim/startup/intro-music", false);
     } else if ( arg == "--enable-intro-music" ) {
-	intro_music = true;
+	fgSetBool("/sim/startup/intro-music", true);
     } else if ( arg == "--disable-mouse-pointer" ) {
-	mouse_pointer = 1;
+	fgSetString("/sim/startup/mouse-pointer", "disabled");
     } else if ( arg == "--enable-mouse-pointer" ) {
-	mouse_pointer = 2;
-    } else if ( arg == "--disable-pause" ) {
-	pause = false;	
-    } else if ( arg == "--enable-pause" ) {
-	pause = true;	
+	fgSetString("/sim/startup/mouse-pointer", "enabled");
+    } else if ( arg == "--disable-freeze" ) {
+        globals->set_freeze(false);
+    } else if ( arg == "--enable-freeze" ) {
+        globals->set_freeze(true);
+    } else if ( arg == "--disable-anti-alias-hud" ) {
+	fgSetBool("/sim/hud/antialiased", false);
+    } else if ( arg == "--enable-anti-alias-hud" ) {
+        fgSetBool("/sim/hud/antialiased", true);
     } else if ( arg.find( "--control=") != string::npos ) {
-	parse_control( arg.substr(10) );
+        fgSetString("/sim/control-mode", arg.substr(10));
+    } else if ( arg == "--disable-auto-coordination" ) {
+        fgSetBool("/sim/auto-coordination", false);
+    } else if ( arg == "--enable-auto-coordination" ) {
+	fgSetBool("/sim/auto-coordination", true);
     } else if ( arg == "--disable-hud" ) {
-	hud_status = false;	
+	fgSetBool("/sim/hud/visibility", false);
     } else if ( arg == "--enable-hud" ) {
-	hud_status = true;	
+	fgSetBool("/sim/hud/visibility", true);
     } else if ( arg == "--disable-panel" ) {
-	panel_status = false;
+	fgSetBool("/sim/panel/visibility", false);
     } else if ( arg == "--enable-panel" ) {
-	panel_status = true;
-	fov *= 0.4232;
+	fgSetBool("/sim/panel/visibility", true);
     } else if ( arg == "--disable-sound" ) {
-	sound = false;
+	fgSetBool("/sim/sound", false);
     } else if ( arg == "--enable-sound" ) {
-	sound = true;
+	fgSetBool("/sim/sound", true);
     } else if ( arg.find( "--airport-id=") != string::npos ) {
-	airport_id = arg.substr( 13 );
+				// NB: changed property name!!!
+	fgSetString("/sim/startup/airport-id", arg.substr(13));
     } else if ( arg.find( "--lon=" ) != string::npos ) {
-	lon = parse_degree( arg.substr(6) );
+	fgSetDouble("/position/longitude",
+			      parse_degree(arg.substr(6)));
+	fgSetString("/sim/startup/airport-id", "");
     } else if ( arg.find( "--lat=" ) != string::npos ) {
-	lat = parse_degree( arg.substr(6) );
+	fgSetDouble("/position/latitude",
+			      parse_degree(arg.substr(6)));
+	fgSetString("/sim/startup/airport-id", "");
     } else if ( arg.find( "--altitude=" ) != string::npos ) {
-	if ( units == FG_UNITS_FEET ) {
-	    altitude = atof( arg.substr(11) ) * FEET_TO_METER;
-	} else {
-	    altitude = atof( arg.substr(11) );
-	}
+	fgSetBool("/sim/startup/onground", false);
+	if ( fgGetString("/sim/startup/units") == "feet" )
+	    fgSetDouble("/position/altitude", atof(arg.substr(11)));
+	else
+	    fgSetDouble("/position/altitude",
+			atof(arg.substr(11)) * METER_TO_FEET);
     } else if ( arg.find( "--uBody=" ) != string::npos ) {
-	if ( units == FG_UNITS_FEET ) {
-	    uBody = atof( arg.substr(8) ) * FEET_TO_METER;
-	} else {
-	    uBody = atof( arg.substr(8) );
-	}
+        fgSetString("/sim/startup/speed-set", "UVW");
+				// FIXME: the units are totally confused here
+	if ( fgGetString("/sim/startup/units") == "feet" )
+	  fgSetDouble("/velocities/uBody", atof(arg.substr(8)));
+	else
+	  fgSetDouble("/velocities/uBody",
+			       atof(arg.substr(8)) * FEET_TO_METER);
     } else if ( arg.find( "--vBody=" ) != string::npos ) {
-	if ( units == FG_UNITS_FEET ) {
-	    vBody = atof( arg.substr(8) ) * FEET_TO_METER;
-	} else {
-	    vBody = atof( arg.substr(8) );
-	}
+        fgSetString("/sim/startup/speed-set", "UVW");
+				// FIXME: the units are totally confused here
+	if ( fgGetString("/sim/startup/units") == "feet" )
+	  fgSetDouble("/velocities/vBody", atof(arg.substr(8)));
+	else
+	  fgSetDouble("/velocities/vBody",
+			       atof(arg.substr(8)) * FEET_TO_METER);
     } else if ( arg.find( "--wBody=" ) != string::npos ) {
-	if ( units == FG_UNITS_FEET ) {
-	    wBody = atof( arg.substr(8) ) * FEET_TO_METER;
-	} else {
-	    wBody = atof( arg.substr(8) );
-	}
+        fgSetString("/sim/startup/speed-set", "UVW");
+				// FIXME: the units are totally confused here
+	if ( fgGetString("/sim/startup/units") == "feet" )
+	  fgSetDouble("/velocities/wBody", atof(arg.substr(8)));
+	else
+	  fgSetDouble("/velocities/wBody",
+			       atof(arg.substr(8)) * FEET_TO_METER);
+    } else if ( arg.find( "--vNorth=" ) != string::npos ) {
+        fgSetString("/sim/startup/speed-set", "NED");
+				// FIXME: the units are totally confused here
+	if ( fgGetString("/sim/startup/units") == "feet" )
+	  fgSetDouble("/velocities/speed-north", atof(arg.substr(8)));
+	else
+	  fgSetDouble("/velocities/speed-north",
+			       atof(arg.substr(8)) * FEET_TO_METER);
+    } else if ( arg.find( "--vEast=" ) != string::npos ) {
+        fgSetString("/sim/startup/speed-set", "NED");
+				// FIXME: the units are totally confused here
+	if ( fgGetString("/sim/startup/units") == "feet" )
+	  fgSetDouble("/velocities/speed-east", atof(arg.substr(8)));
+	else
+	  fgSetDouble("/velocities/speed-east",
+			       atof(arg.substr(8)) * FEET_TO_METER);
+    } else if ( arg.find( "--vDown=" ) != string::npos ) {
+        fgSetString("/sim/startup/speed-set", "NED");
+				// FIXME: the units are totally confused here
+	if ( fgGetString("/sim/startup/units") == "feet" )
+	  fgSetDouble("/velocities/speed-down", atof(arg.substr(8)));
+	else
+	  fgSetDouble("/velocities/speed-down",
+			       atof(arg.substr(8)) * FEET_TO_METER);
+    } else if ( arg.find( "--vc=" ) != string::npos) {
+        fgSetString("/sim/startup/speed-set", "knots");
+	fgSetDouble("/velocities/airspeed", atof(arg.substr(5)));
+    } else if ( arg.find( "--mach=" ) != string::npos) {
+        fgSetString("/sim/startup/speed-set", "mach");
+	fgSetDouble("/velocities/mach", atof(arg.substr(7)));
     } else if ( arg.find( "--heading=" ) != string::npos ) {
-	heading = atof( arg.substr(10) );
+	fgSetDouble("/orientation/heading", atof(arg.substr(10)));
     } else if ( arg.find( "--roll=" ) != string::npos ) {
-	roll = atof( arg.substr(7) );
+	fgSetDouble("/orientation/roll", atof(arg.substr(7)));
     } else if ( arg.find( "--pitch=" ) != string::npos ) {
-	pitch = atof( arg.substr(8) );
+	fgSetDouble("/orientation/pitch", atof(arg.substr(8)));
     } else if ( arg.find( "--fg-root=" ) != string::npos ) {
-	fg_root = arg.substr( 10 );
+	globals->set_fg_root(arg.substr( 10 ));
+    } else if ( arg.find( "--fg-scenery=" ) != string::npos ) {
+        globals->set_fg_scenery(arg.substr( 13 ));
     } else if ( arg.find( "--fdm=" ) != string::npos ) {
-	flight_model = parse_fdm( arg.substr(6) );
+	fgSetString("/sim/flight-model", arg.substr(6));
+    } else if ( arg.find( "--aircraft=" ) != string::npos ) {
+	fgSetString("/sim/aircraft", arg.substr(11));
+    } else if ( arg.find( "--aircraft-dir=" ) != string::npos ) {
+        fgSetString("/sim/aircraft-dir", arg.substr(15));
     } else if ( arg.find( "--model-hz=" ) != string::npos ) {
-	model_hz = atoi( arg.substr(11) );
+	fgSetInt("/sim/model-hz", atoi(arg.substr(11)));
     } else if ( arg.find( "--speed=" ) != string::npos ) {
-	speed_up = atoi( arg.substr(8) );
+	fgSetInt("/sim/speed-up", atoi(arg.substr(8)));
+    } else if ( arg.find( "--trim") != string::npos) {
+        fgSetBool("/sim/startup/trim", true);
+    } else if ( arg.find( "--notrim") != string::npos) {
+        fgSetBool("/sim/startup/trim", false);
+    } else if ( arg.find( "--on-ground") != string::npos) {
+        fgSetBool("/sim/startup/onground", true);
+    } else if ( arg.find( "--in-air") != string::npos) {
+        fgSetBool("/sim/startup/onground", false);
     } else if ( arg == "--fog-disable" ) {
-	fog = FG_FOG_DISABLED;	
+	fgSetString("/sim/rendering/fog", "disabled");
     } else if ( arg == "--fog-fastest" ) {
-	fog = FG_FOG_FASTEST;	
+	fgSetString("/sim/rendering/fog", "fastest");
     } else if ( arg == "--fog-nicest" ) {
-	fog = FG_FOG_NICEST;	
+	fgSetString("/sim/fog", "nicest");
+    } else if ( arg == "--disable-clouds" ) {
+        fgSetBool("/environment/clouds/status", false);
+    } else if ( arg == "--enable-clouds" ) {
+        fgSetBool("/environment/clouds/status", true);
+    } else if ( arg.find( "--clouds-asl=" ) != string::npos ) {
+				// FIXME: check units
+        if ( fgGetString("/sim/startup/units") == "feet" )
+	  fgSetDouble("/environment/clouds/altitude",
+				atof(arg.substr(13)) * FEET_TO_METER);
+	else
+	  fgSetDouble("/environment/clouds/altitude",
+				atof(arg.substr(13)));
     } else if ( arg.find( "--fov=" ) != string::npos ) {
-	fov = parse_fov( arg.substr(6) );
+	parse_fov( arg.substr(6) );
     } else if ( arg == "--disable-fullscreen" ) {
-	fullscreen = false;	
+        fgSetBool("/sim/startup/fullscreen", false);
     } else if ( arg== "--enable-fullscreen") {
-	fullscreen = true;	
+        fgSetBool("/sim/startup/fullscreen", true);
     } else if ( arg == "--shading-flat") {
-	shading = 0;	
+	fgSetBool("/sim/rendering/shading", false);
     } else if ( arg == "--shading-smooth") {
-	shading = 1;	
+	fgSetBool("/sim/rendering/shading", true);
     } else if ( arg == "--disable-skyblend") {
-	skyblend = false;	
+	fgSetBool("/sim/rendering/skyblend", false);
     } else if ( arg== "--enable-skyblend" ) {
-	skyblend = true;	
+	fgSetBool("/sim/rendering/skyblend", true);
     } else if ( arg == "--disable-textures" ) {
-	textures = false;	
+        fgSetBool("/sim/rendering/textures", false);
     } else if ( arg == "--enable-textures" ) {
-	textures = true;
+        fgSetBool("/sim/rendering/textures", true);
     } else if ( arg == "--disable-wireframe" ) {
-	wireframe = false;	
+        fgSetBool("/sim/rendering/wireframe", false);
     } else if ( arg == "--enable-wireframe" ) {
-	wireframe = true;
+        fgSetBool("/sim/rendering/wireframe", true);
     } else if ( arg.find( "--geometry=" ) != string::npos ) {
 	bool geometry_ok = true;
+	int xsize = 0, ysize = 0;
 	string geometry = arg.substr( 11 );
 	string::size_type i = geometry.find('x');
 
  	if (i != string::npos) {
 	    xsize = atoi(geometry.substr(0, i));
 	    ysize = atoi(geometry.substr(i+1));
-	    // cout << "Geometry is " << xsize << 'x' << ysize << '\n';
   	} else {
 	    geometry_ok = false;
  	}
@@ -695,32 +718,142 @@ int fgOPTIONS::parse_option( const string& arg ) {
   	    FG_LOG( FG_GENERAL, FG_ALERT, "Unknown geometry: " << geometry );
  	    FG_LOG( FG_GENERAL, FG_ALERT,
  		    "Setting geometry to " << xsize << 'x' << ysize << '\n');
-  	}
+  	} else {
+	  FG_LOG( FG_GENERAL, FG_INFO,
+		  "Setting geometry to " << xsize << 'x' << ysize << '\n');
+	  fgSetInt("/sim/startup/xsize", xsize);
+	  fgSetInt("/sim/startup/ysize", ysize);
+	}
+    } else if ( arg.find( "--bpp=" ) != string::npos ) {
+	string bits_per_pix = arg.substr( 6 );
+	if ( bits_per_pix == "16" ) {
+	    fgSetInt("/sim/rendering/bits-per-pixel", 16);
+	} else if ( bits_per_pix == "24" ) {
+	    fgSetInt("/sim/rendering/bits-per-pixel", 24);
+	} else if ( bits_per_pix == "32" ) {
+	    fgSetInt("/sim/rendering/bits-per-pixel", 32);
+	} else {
+	  FG_LOG(FG_GENERAL, FG_ALERT, "Unsupported bpp " << bits_per_pix);
+	}
     } else if ( arg == "--units-feet" ) {
-	units = FG_UNITS_FEET;	
+	fgSetString("/sim/startup/units", "feet");
     } else if ( arg == "--units-meters" ) {
-	units = FG_UNITS_METERS;	
-    } else if ( arg.find( "--tile-radius=" ) != string::npos ) {
-	tile_radius = parse_tile_radius( arg.substr(14) );
-	tile_diameter = tile_radius * 2 + 1;
-    } else if ( arg.find( "--time-offset=" ) != string::npos ) {
-	time_offset = parse_time_offset( (arg.substr(14)) );
-    } else if (arg.find( "--start-date-gmt=") != string::npos ) {
-        start_gst = parse_date( (arg.substr(17)) );
-    } else if (arg.find( "--start-data-lst=") != string::npos ) {
-        start_lst = parse_date( (arg.substr(17)) );
+	fgSetString("/sim/startup/units", "meters");
+    } else if ( arg.find( "--time-offset" ) != string::npos ) {
+        fgSetInt("/sim/startup/time-offset",
+			   parse_time_offset( (arg.substr(14)) ));
+    } else if ( arg.find( "--time-match-real") != string::npos ) {
+        fgSetString("/sim/startup/time-offset_type",
+			      "system-offset");
+    } else if ( arg.find( "--time-match-local") != string::npos ) {
+        fgSetString("/sim/startup/time-offset_type",
+			      "latitude-offset");
+    } else if ( arg.find( "--start-date-sys=") != string::npos ) {
+        fgSetInt("/sim/startup/time-offset",
+			   parse_date((arg.substr(17))));
+	fgSetString("/sim/startup/time-offset-type", "system");
+    } else if ( arg.find( "--start-date-lat=") != string::npos ) {
+        fgSetInt("/sim/startup/time-offset",
+			   parse_date((arg.substr(17))));
+	fgSetString("/sim/startup/time-offset-type",
+			   "latitude");
+    } else if ( arg.find( "--start-date-gmt=") != string::npos ) {
+        fgSetInt("/sim/startup/time-offset",
+			   parse_date((arg.substr(17))));
+	fgSetString("/sim/startup/time-offset-type", "gmt");
     } else if ( arg == "--hud-tris" ) {
-	tris_or_culled = 0;	
+        fgSetString("/sim/hud/frame-stat-type", "tris");
     } else if ( arg == "--hud-culled" ) {
-	tris_or_culled = 1;
-    } else if ( arg.find( "--serial=" ) != string::npos ) {
-	parse_serial( arg.substr(9) );
+        fgSetString("/sim/hud/frame-stat-type", "culled");
+    } else if ( arg.find( "--native=" ) != string::npos ) {
+	parse_channel( "native", arg.substr(9) );
+    } else if ( arg.find( "--garmin=" ) != string::npos ) {
+	parse_channel( "garmin", arg.substr(9) );
+    } else if ( arg.find( "--nmea=" ) != string::npos ) {
+	parse_channel( "nmea", arg.substr(7) );
+    } else if ( arg.find( "--props=" ) != string::npos ) {
+	parse_channel( "props", arg.substr(8) );
+    } else if ( arg.find( "--pve=" ) != string::npos ) {
+	parse_channel( "pve", arg.substr(6) );
+    } else if ( arg.find( "--ray=" ) != string::npos ) {
+	parse_channel( "ray", arg.substr(6) );
+    } else if ( arg.find( "--rul=" ) != string::npos ) {
+	parse_channel( "rul", arg.substr(6) );
+    } else if ( arg.find( "--joyclient=" ) != string::npos ) {
+	parse_channel( "joyclient", arg.substr(12) );
 #ifdef FG_NETWORK_OLK
+    } else if ( arg == "--disable-network-olk" ) {
+        fgSetBool("/sim/networking/olk", false);
+    } else if ( arg== "--enable-network-olk") {
+        fgSetBool("/sim/networking/olk", true);
     } else if ( arg == "--net-hud" ) {
-	net_hud_display = 1;	
+        fgSetBool("/sim/hud/net-display", true);
+	net_hud_display = 1;	// FIXME
     } else if ( arg.find( "--net-id=") != string::npos ) {
-	net_id = arg.substr( 9 );
+        fgSetString("sim/networking/call-sign", arg.substr(9));
 #endif
+    } else if ( arg.find( "--prop:" ) == 0 ) {
+        string assign = arg.substr(7);
+	int pos = assign.find('=');
+	if (pos == arg.npos || pos == 0) {
+	    FG_LOG(FG_GENERAL, FG_ALERT, "Bad property assignment: " << arg);
+	    return FG_OPTIONS_ERROR;
+	}
+	string name = assign.substr(0, pos);
+	string value = assign.substr(pos + 1);
+	fgSetString(name.c_str(), value);
+	// FG_LOG(FG_GENERAL, FG_INFO, "Setting default value of property "
+	//        << name << " to \"" << value << '"');
+    // $$$ begin - added VS Renganathan, 14 Oct 2K
+    // for multi-window outside window imagery
+    } else if ( arg.find( "--view-offset=" ) != string::npos ) {
+	string woffset = arg.substr( 14 );
+	double default_view_offset = 0.0;
+	if ( woffset == "LEFT" ) {
+	       default_view_offset = FG_PI * 0.25;
+	} else if ( woffset == "RIGHT" ) {
+	    default_view_offset = FG_PI * 1.75;
+	} else if ( woffset == "CENTER" ) {
+	    default_view_offset = 0.00;
+	} else {
+	    default_view_offset = atof( woffset.c_str() ) * DEG_TO_RAD;
+	}
+	FGViewerRPH *pilot_view =
+	    (FGViewerRPH *)globals->get_viewmgr()->get_view( 0 );
+	pilot_view->set_view_offset( default_view_offset );
+	pilot_view->set_goal_view_offset( default_view_offset );
+	fgSetDouble("/sim/startup/view-offset", default_view_offset);
+    // $$$ end - added VS Renganathan, 14 Oct 2K
+    } else if ( arg.find( "--visibility=" ) != string::npos ) {
+	fgSetDouble("/environment/visibility", atof(arg.substr(13)));
+    } else if ( arg.find( "--visibility-miles=" ) != string::npos ) {
+        double visibility = atof(arg.substr(19)) * 5280.0 * FEET_TO_METER;
+	fgSetDouble("/environment/visibility", visibility);
+    } else if ( arg.find( "--wind=" ) == 0 ) {
+        string val = arg.substr(7);
+	int pos = val.find('@');
+	if (pos == string::npos) {
+	  FG_LOG(FG_GENERAL, FG_ALERT, "bad wind value " << val);
+	  return FG_OPTIONS_ERROR;
+	}
+	double dir = atof(val.substr(0,pos).c_str());
+	double speed = atof(val.substr(pos+1).c_str());
+	FG_LOG(FG_GENERAL, FG_INFO, "WIND: " << dir << '@' << 
+	       speed << " knots" << endl);
+				// convert to fps
+	speed *= NM_TO_METER * METER_TO_FEET * (1.0/3600);
+	dir += 180;
+	if (dir >= 360)
+	  dir -= 360;
+	dir *= DEG_TO_RAD;
+	fgSetDouble("/environment/wind-north",
+					     speed * cos(dir));
+	fgSetDouble("/environment/wind-east",
+					     speed * sin(dir));
+    } else if ( arg.find( "--wp=" ) != string::npos ) {
+	parse_wp( arg.substr( 5 ) );
+    } else if ( arg.find( "--flight-plan=") != string::npos) {
+	parse_flightplan ( arg.substr (14) );
     } else {
 	FG_LOG( FG_GENERAL, FG_ALERT, "Unknown option '" << arg << "'" );
 	return FG_OPTIONS_ERROR;
@@ -730,8 +863,72 @@ int fgOPTIONS::parse_option( const string& arg ) {
 }
 
 
+// Scan the command line options for an fg_root definition and set
+// just that.
+string
+fgScanForRoot (int argc, char **argv) 
+{
+    int i = 1;
+
+    FG_LOG(FG_GENERAL, FG_INFO, "Scanning for root: command line");
+
+    while ( i < argc ) {
+	FG_LOG( FG_GENERAL, FG_DEBUG, "argv[" << i << "] = " << argv[i] );
+
+	string arg = argv[i];
+	if ( arg.find( "--fg-root=" ) != string::npos ) {
+	    return arg.substr( 10 );
+	}
+
+	i++;
+    }
+
+    return "";
+}
+
+
+// Scan the config file for an fg_root definition and set just that.
+string
+fgScanForRoot (const string& path)
+{
+    fg_gzifstream in( path );
+    if ( !in.is_open() )
+      return "";
+
+    FG_LOG( FG_GENERAL, FG_INFO, "Scanning for root: " << path );
+
+    in >> skipcomment;
+#ifndef __MWERKS__
+    while ( ! in.eof() ) {
+#else
+    char c = '\0';
+    while ( in.get(c) && c != '\0' ) {
+	in.putback(c);
+#endif
+	string line;
+
+#ifdef GETLINE_NEEDS_TERMINATOR
+        getline( in, line, '\n' );
+#elif defined( macintosh )
+	getline( in, line, '\r' );
+#else
+        getline( in, line );
+#endif
+
+	if ( line.find( "--fg-root=" ) != string::npos ) {
+	    return line.substr( 10 );
+	}
+
+	in >> skipcomment;
+    }
+
+    return "";
+}
+
+
 // Parse the command line options
-int fgOPTIONS::parse_command_line( int argc, char **argv ) {
+void
+fgParseOptions (int argc, char **argv) {
     int i = 1;
     int result;
 
@@ -742,21 +939,21 @@ int fgOPTIONS::parse_command_line( int argc, char **argv ) {
 
 	result = parse_option(argv[i]);
 	if ( (result == FG_OPTIONS_HELP) || (result == FG_OPTIONS_ERROR) ) {
-	    return(result);
+	    fgUsage();
+	    exit(-1);
 	}
 
 	i++;
     }
-    
-    return(FG_OPTIONS_OK);
 }
 
 
 // Parse config file options
-int fgOPTIONS::parse_config_file( const string& path ) {
+void
+fgParseOptions (const string& path) {
     fg_gzifstream in( path );
     if ( !in.is_open() )
-	return(FG_OPTIONS_ERROR);
+      return;
 
     FG_LOG( FG_GENERAL, FG_INFO, "Processing config file: " << path );
 
@@ -771,119 +968,180 @@ int fgOPTIONS::parse_config_file( const string& path ) {
 	string line;
 
 #ifdef GETLINE_NEEDS_TERMINATOR
-	getline( in, line, '\n' );
+        getline( in, line, '\n' );
+#elif defined( macintosh )
+	getline( in, line, '\r' );
 #else
-	getline( in, line );
+        getline( in, line );
 #endif
 
 	if ( parse_option( line ) == FG_OPTIONS_ERROR ) {
 	    FG_LOG( FG_GENERAL, FG_ALERT, 
 		    "Config file parse error: " << path << " '" 
 		    << line << "'" );
+	    fgUsage();
 	    exit(-1);
 	}
 	in >> skipcomment;
     }
-
-    return FG_OPTIONS_OK;
 }
 
 
 // Print usage message
-void fgOPTIONS::usage ( void ) {
-    printf("Usage: fg [ options ... ]\n");
-    printf("\n");
-
-    printf("General Options:\n");
-    printf("\t--help -h:  print usage\n");
-    printf("\t--fg-root=path:  specify the root path for all the data files\n");
-    printf("\t--disable-game-mode:  disable full-screen game mode\n");
-    printf("\t--enable-game-mode:  enable full-screen game mode\n");
-    printf("\t--disable-splash-screen:  disable splash screen\n");
-    printf("\t--enable-splash-screen:  enable splash screen\n");
-    printf("\t--disable-intro-music:  disable introduction music\n");
-    printf("\t--enable-intro-music:  enable introduction music\n");
-    printf("\t--disable-mouse-pointer:  disable extra mouse pointer\n");
-    printf("\t--enable-mouse-pointer:  enable extra mouse pointer (i.e. for\n");
-    printf("\t\tfull screen voodoo/voodoo-II based cards.)\n");
-    printf("\t--disable-pause:  start out in an active state\n");
-    printf("\t--enable-pause:  start out in a paused state\n");
-    printf("\t--control=mode:  primary control mode (joystick, keyboard, mouse)\n");
-    printf("\n");
-
-    printf("Features:\n");
-    printf("\t--disable-hud:  disable heads up display\n");
-    printf("\t--enable-hud:  enable heads up display\n");
-    printf("\t--disable-panel:  disable instrument panel\n");
-    printf("\t--enable-panel:  enable instrumetn panel\n");
-    printf("\t--disable-sound:  disable sound effects\n");
-    printf("\t--enable-sound:  enable sound effects\n");
-    printf("\n");
+void 
+fgUsage ()
+{
+    cout << "Usage: fg [ options ... ]" << endl;
+    cout << endl;
+
+    cout << "General Options:" << endl;
+    cout << "\t--help -h:  print usage" << endl;
+    cout << "\t--fg-root=path:  specify the root path for all the data files"
+	 << endl;
+    cout << "\t--fg-scenery=path:  specify the base path for all the scenery"
+	 << " data." << endl
+	 << "\t\tdefaults to $FG_ROOT/Scenery" << endl;
+    cout << "\t--disable-game-mode:  disable full-screen game mode" << endl;
+    cout << "\t--enable-game-mode:  enable full-screen game mode" << endl;
+    cout << "\t--disable-splash-screen:  disable splash screen" << endl;
+    cout << "\t--enable-splash-screen:  enable splash screen" << endl;
+    cout << "\t--disable-intro-music:  disable introduction music" << endl;
+    cout << "\t--enable-intro-music:  enable introduction music" << endl;
+    cout << "\t--disable-mouse-pointer:  disable extra mouse pointer" << endl;
+    cout << "\t--enable-mouse-pointer:  enable extra mouse pointer (i.e. for"
+	 << endl;
+    cout << "\t\tfull screen voodoo/voodoo-II based cards.)" << endl;
+    cout << "\t--disable-freeze:  start out in an running state" << endl;
+    cout << "\t--enable-freeze:  start out in a frozen state" << endl;
+    cout << "\t--control=mode:  primary control mode " 
+	 << "(joystick, keyboard, mouse)" << endl;
+    cout << endl;
+
+    cout << "Features:" << endl;
+    cout << "\t--disable-hud:  disable heads up display" << endl;
+    cout << "\t--enable-hud:  enable heads up display" << endl;
+    cout << "\t--disable-panel:  disable instrument panel" << endl;
+    cout << "\t--enable-panel:  enable instrumetn panel" << endl;
+    cout << "\t--disable-sound:  disable sound effects" << endl;
+    cout << "\t--enable-sound:  enable sound effects" << endl;
+    cout << "\t--disable-anti-alias-hud:  disable anti aliased hud" << endl;
+    cout << "\t--enable-anti-alias-hud:  enable anti aliased hud" << endl;
+    cout << endl;
  
-    printf("Flight Model:\n");
-    printf("\t--fdm=abcd:  one of slew, jsb, larcsim, or external\n");
-    printf("\t--model-hz=n:  run the FDM this rate (iterations per second)\n");
-    printf("\t--speed=n:  run the FDM this much faster than real time\n");
-    printf("\n");
-
-    printf("Initial Position and Orientation:\n");
-    printf("\t--airport-id=ABCD:  specify starting postion by airport id\n");
-    printf("\t--lon=degrees:  starting longitude in degrees (west = -)\n");
-    printf("\t--lat=degrees:  starting latitude in degrees (south = -)\n");
-    printf("\t--altitude=feet:  starting altitude in feet\n");
-    printf("\t\t(unless --units-meters specified\n");
-    printf("\t--heading=degrees:  heading (yaw) angle in degress (Psi)\n");
-    printf("\t--roll=degrees:  roll angle in degrees (Phi)\n");
-    printf("\t--pitch=degrees:  pitch angle in degrees (Theta)\n");
-    printf("\t--uBody=feet per second:  velocity along the body X axis\n");
-    printf("\t--vBody=feet per second:  velocity along the body Y axis\n");
-    printf("\t--wBody=feet per second:  velocity along the body Z axis\n");
-    printf("\t\t(unless --units-meters specified\n");
-    printf("\n");
-
-    printf("Rendering Options:\n");
-    printf("\t--fog-disable:  disable fog/haze\n");
-    printf("\t--fog-fastest:  enable fastest fog/haze\n");
-    printf("\t--fog-nicest:  enable nicest fog/haze\n");
-    printf("\t--fov=xx.x:  specify initial field of view angle in degrees\n");
-    printf("\t--disable-fullscreen:  disable fullscreen mode\n");
-    printf("\t--enable-fullscreen:  enable fullscreen mode\n");
-    printf("\t--shading-flat:  enable flat shading\n");
-    printf("\t--shading-smooth:  enable smooth shading\n");
-    printf("\t--disable-skyblend:  disable sky blending\n");
-    printf("\t--enable-skyblend:  enable sky blending\n");
-    printf("\t--disable-textures:  disable textures\n");
-    printf("\t--enable-textures:  enable textures\n");
-    printf("\t--disable-wireframe:  disable wireframe drawing mode\n");
-    printf("\t--enable-wireframe:  enable wireframe drawing mode\n");
-    printf("\t--geometry=WWWxHHH:  window geometry: 640x480, 800x600, etc.\n");
-    printf("\n");
-
-    printf("Scenery Options:\n");
-    printf("\t--tile-radius=n:  specify tile radius, must be 1 - 4\n");
-    printf("\n");
-
-    printf("Hud Options:\n");
-    printf("\t--units-feet:  Hud displays units in feet\n");
-    printf("\t--units-meters:  Hud displays units in meters\n");
-    printf("\t--hud-tris:  Hud displays number of triangles rendered\n");
-    printf("\t--hud-culled:  Hud displays percentage of triangles culled\n");
-    printf("\n");
+    cout << "Flight Model:" << endl;
+    cout << "\t--fdm=abcd:  selects the core flight model code." << endl;
+    cout << "\t\tcan be one of jsb, larcsim, magic, external, balloon, or ada"
+	 << endl;
+    cout << "\t--aircraft=abcd:  aircraft model to load" << endl;
+    cout << "\t--model-hz=n:  run the FDM this rate (iterations per second)" 
+	 << endl;
+    cout << "\t--speed=n:  run the FDM this much faster than real time" << endl;
+    cout << "\t--notrim:  Do NOT attempt to trim the model when initializing JSBsim" << endl;
+    cout << "\t--on-ground:  Start up at ground level (default)" << endl;
+    cout << "\t--in-air:  Start up in air (implied by specifying an initial"
+	 << " altitude above ground level." << endl;
+    cout << "\t--wind=DIR@SPEED: specify wind coming from DIR (degrees) at SPEED (knots)" << endl;
+    cout << endl;
+
+    //(UIUC)
+    cout <<"Aircraft model directory:" << endl;
+    cout <<"\t--aircraft-dir=<path> path is relative to the path of the executable" << endl;
+    cout << endl;
+
+    cout << "Initial Position and Orientation:" << endl;
+    cout << "\t--airport-id=ABCD:  specify starting postion by airport id" 
+	 << endl;
+    cout << "\t--lon=degrees:  starting longitude in degrees (west = -)" 
+	 << endl;
+    cout << "\t--lat=degrees:  starting latitude in degrees (south = -)"
+	 << endl;
+    cout << "\t--altitude=feet:  starting altitude in feet" << endl;
+    cout << "\t\t(unless --units-meters specified" << endl;
+    cout << "\t--heading=degrees:  heading (yaw) angle in degress (Psi)"
+	 << endl;
+    cout << "\t--roll=degrees:  roll angle in degrees (Phi)" << endl;
+    cout << "\t--pitch=degrees:  pitch angle in degrees (Theta)" << endl;
+    cout << "\t--uBody=feet per second:  velocity along the body X axis"
+	 << endl;
+    cout << "\t--vBody=feet per second:  velocity along the body Y axis"
+	 << endl;
+    cout << "\t--wBody=feet per second:  velocity along the body Z axis"
+	 << endl;
+    cout << "\t\t(unless --units-meters specified" << endl;
+    cout << "\t--vc= initial airspeed in knots (--fdm=jsb only)" << endl;
+    cout << "\t--mach= initial mach number (--fdm=jsb only)" << endl;
+    cout << endl;
+
+    cout << "Rendering Options:" << endl;
+    cout << "\t--fog-disable:  disable fog/haze" << endl;
+    cout << "\t--fog-fastest:  enable fastest fog/haze" << endl;
+    cout << "\t--fog-nicest:  enable nicest fog/haze" << endl;
+    cout << "\t--enable-clouds:  enable demo cloud layer" << endl;
+    cout << "\t--disable-clouds:  disable demo cloud layer" << endl;
+    cout << "\t--clouds-asl=xxx:  specify altitude of cloud layer above sea level" << endl;
+    cout << "\t--fov=xx.x:  specify initial field of view angle in degrees"
+	 << endl;
+    cout << "\t--disable-fullscreen:  disable fullscreen mode" << endl;
+    cout << "\t--enable-fullscreen:  enable fullscreen mode" << endl;
+    cout << "\t--shading-flat:  enable flat shading" << endl;
+    cout << "\t--shading-smooth:  enable smooth shading" << endl;
+    cout << "\t--disable-skyblend:  disable sky blending" << endl;
+    cout << "\t--enable-skyblend:  enable sky blending" << endl;
+    cout << "\t--disable-textures:  disable textures" << endl;
+    cout << "\t--enable-textures:  enable textures" << endl;
+    cout << "\t--disable-wireframe:  disable wireframe drawing mode" << endl;
+    cout << "\t--enable-wireframe:  enable wireframe drawing mode" << endl;
+    cout << "\t--geometry=WWWxHHH:  window geometry: 640x480, 800x600, etc."
+	 << endl;
+    cout << "\t--view-offset=xxx:  set the default forward view direction"
+	 << endl;
+    cout << "\t\tas an offset from straight ahead.  Allowable values are"
+	 << endl;
+    cout << "\t\tLEFT, RIGHT, CENTER, or a specific number of degrees" << endl;
+    cout << "\t--visibility=xxx:  specify initial visibility in meters" << endl;
+    cout << "\t--visibility-miles=xxx:  specify initial visibility in miles"
+	 << endl;
+    cout << endl;
+
+    cout << "Scenery Options:" << endl;
+    cout << "\t--tile-radius=n:  specify tile radius, must be 1 - 4" << endl;
+    cout << endl;
+
+    cout << "Hud Options:" << endl;
+    cout << "\t--units-feet:  Hud displays units in feet" << endl;
+    cout << "\t--units-meters:  Hud displays units in meters" << endl;
+    cout << "\t--hud-tris:  Hud displays number of triangles rendered" << endl;
+    cout << "\t--hud-culled:  Hud displays percentage of triangles culled"
+	 << endl;
+    cout << endl;
 	
-    printf("Time Options:\n");
-    printf("\t--time-offset=[+-]hh:mm:ss:  offset local time by this amount\n");
-    printf("\t--start-date-gmt=yyyy:mm:dd:hh:mm:ss: specify a starting date/time. Time is Greenwich Mean Time\n");
-    printf("\t--start-date-lst=yyyy:mm:dd:hh:mm:ss: specify a starting date/time. Uses local sidereal time\n");
+    cout << "Time Options:" << endl;
+    cout << "\t--time-offset=[+-]hh:mm:ss: add this time offset" << endl;
+    cout << "\t--time-match-real: Synchronize real-world and FlightGear" << endl
+	 << "\t\ttime. Can be used in combination with --time-offset." << endl;
+    cout << "\t--time-match-local:Synchronize local real-world and " << endl
+	 << "\t\tFlightGear time" << endl;   
+    cout << "\t--start-date-sys=yyyy:mm:dd:hh:mm:ss: specify a starting" << endl
+	 << "\t\tdate/time. Uses your system time " << endl;
+    cout << "\t--start-date-gmt=yyyy:mm:dd:hh:mm:ss: specify a starting" << endl
+	 << "\t\tdate/time. Uses Greenwich Mean Time" << endl;
+    cout << "\t--start-date-lat=yyyy:mm:dd:hh:mm:ss: specify a starting" << endl
+	 << "\t\tdate/time. Uses Local Aircraft Time" << endl;
 #ifdef FG_NETWORK_OLK
-    printf("\n");
+    cout << endl;
 
-    printf("Network Options:\n");
-    printf("\t--net-hud:  Hud displays network info\n");
-    printf("\t--net-id=name:  specify your own callsign\n");
+    cout << "Network Options:" << endl;
+    cout << "\t--enable-network-olk:  enable Multipilot mode" << endl;
+    cout << "\t--disable-network-olk:  disable Multipilot mode (default)" << endl;
+    cout << "\t--net-hud:  Hud displays network info" << endl;
+    cout << "\t--net-id=name:  specify your own callsign" << endl;
 #endif
-}
-
 
-// Destructor
-fgOPTIONS::~fgOPTIONS( void ) {
+    cout << endl;
+    cout << "Route/Way Point Options:" << endl;
+    cout << "\t--wp=ID[@alt]:  specify a waypoint for the GC autopilot" << endl;
+    cout << "\t\tYou can specify multiple waypoints (a route) with multiple"
+	 << endl;
+    cout << "\t\tinstances of --wp=" << endl;
+    cout << "\t--flight-plan=[file]: Read all waypoints from [file]" <<endl;
 }