]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/options.cxx
Added options to set up avionics from the command line:
[flightgear.git] / src / Main / options.cxx
index e5eedb048113306b7f334a83c3f1b8d2f156eb7e..836af0dad5ada1bc23995a45eec6f12f8855ba1b 100644 (file)
 
 #include <simgear/compiler.h>
 #include <simgear/misc/exception.hxx>
+#include <simgear/debug/logstream.hxx>
 
-/* normans fix */
-#if defined(FX) && defined(XMESA)
-bool global_fullscreen = true;
-#endif
-
-#include <math.h>            // rint()
+#include <math.h>              // rint()
 #include <stdio.h>
-#include <stdlib.h>          // atof(), atoi()
-#include <string.h>
+#include <stdlib.h>            // atof(), atoi()
+#include <string.h>            // strcmp()
+#include <algorithm>
 
 #include STL_STRING
 
+#include <plib/ul.h>
+
+#include <simgear/math/sg_random.h>
 #include <simgear/misc/sgstream.hxx>
+#include <simgear/misc/sg_path.hxx>
+#include <simgear/route/route.hxx>
+#include <simgear/route/waypoint.hxx>
 
 // #include <Include/general.hxx>
 // #include <Airports/simple.hxx>
@@ -57,9 +60,12 @@ bool global_fullscreen = true;
 #include "fg_init.hxx"
 #include "fg_props.hxx"
 #include "options.hxx"
+#include "util.hxx"
 #include "viewmgr.hxx"
 
+
 SG_USING_STD(string);
+SG_USING_STD(sort);
 SG_USING_NAMESPACE(std);
 
 
@@ -69,14 +75,16 @@ enum
 {
     FG_OPTIONS_OK = 0,
     FG_OPTIONS_HELP = 1,
-    FG_OPTIONS_ERROR = 2
+    FG_OPTIONS_ERROR = 2,
+    FG_OPTIONS_VERBOSE_HELP = 3,
+    FG_OPTIONS_SHOW_AIRCRAFT = 4
 };
 
 static double
 atof( const string& str )
 {
 
-#ifdef __MWERKS__ 
+#ifdef __MWERKS__
     // -dw- if ::atof is called, then we get an infinite loop
     return std::atof( str.c_str() );
 #else
@@ -87,7 +95,7 @@ atof( const string& str )
 static int
 atoi( const string& str )
 {
-#ifdef __MWERKS__ 
+#ifdef __MWERKS__
     // -dw- if ::atoi is called, then we get an infinite loop
     return std::atoi( str.c_str() );
 #else
@@ -100,7 +108,7 @@ atoi( const string& str )
  * 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 
+ * in case, we provide some initial sane values here. This method
  * should be invoked *before* reading any init files.
  */
 void
@@ -117,9 +125,9 @@ fgSetDefaults ()
        // Otherwise, default to Scenery being in $FG_ROOT/Scenery
        globals->set_fg_scenery("");
     }
-                               // Position (Globe, AZ)
-    fgSetDouble("/position/longitude-deg", -110.6642444);
-    fgSetDouble("/position/latitude-deg", 33.3528917);
+                               // Position (deliberately out of range)
+    fgSetDouble("/position/longitude-deg", 9999.0);
+    fgSetDouble("/position/latitude-deg", 9999.0);
     fgSetDouble("/position/altitude-ft", -9999.0);
 
                                // Orientation
@@ -128,7 +136,6 @@ fgSetDefaults ()
     fgSetDouble("/orientation/pitch-deg", 0.424);
 
                                // Velocities
-    fgSetString("/sim/startup/speed-set", "knots");
     fgSetDouble("/velocities/uBody-fps", 0.0);
     fgSetDouble("/velocities/vBody-fps", 0.0);
     fgSetDouble("/velocities/wBody-fps", 0.0);
@@ -138,6 +145,28 @@ fgSetDefaults ()
     fgSetDouble("/velocities/airspeed-kt", 0.0);
     fgSetDouble("/velocities/mach", 0.0);
 
+                                // Presets
+    fgSetDouble("/sim/presets/longitude-deg", 9999.0);
+    fgSetDouble("/sim/presets/latitude-deg", 9999.0);
+    fgSetDouble("/sim/presets/altitude-ft", -9999.0);
+
+    fgSetDouble("/sim/presets/heading-deg", 270);
+    fgSetDouble("/sim/presets/roll-deg", 0);
+    fgSetDouble("/sim/presets/pitch-deg", 0.424);
+
+    fgSetString("/sim/presets/speed-set", "knots");
+    fgSetDouble("/sim/presets/airspeed-kt", 0.0);
+    fgSetDouble("/sim/presets/mach", 0.0);
+    fgSetDouble("/sim/presets/uBody-fps", 0.0);
+    fgSetDouble("/sim/presets/vBody-fps", 0.0);
+    fgSetDouble("/sim/presets/wBody-fps", 0.0);
+    fgSetDouble("/sim/presets/speed-north-fps", 0.0);
+    fgSetDouble("/sim/presets/speed-east-fps", 0.0);
+    fgSetDouble("/sim/presets/speed-down-fps", 0.0);
+
+    fgSetBool("/sim/presets/onground", true);
+    fgSetBool("/sim/presets/trim", false);
+
                                // Miscellaneous
     fgSetBool("/sim/startup/game-mode", false);
     fgSetBool("/sim/startup/splash-screen", true);
@@ -152,35 +181,37 @@ fgSetDefaults ()
 #else
     fgSetString("/sim/startup/browser-app", "webrun.bat");
 #endif
+    fgSetInt("/sim/log-level", SG_WARN);
+
                                // Features
+    fgSetBool("/sim/hud/antialiased", false);
+    fgSetBool("/sim/hud/enable3d", true);
     fgSetBool("/sim/hud/visibility", false);
     fgSetBool("/sim/panel/visibility", true);
-    fgSetBool("/sim/sound", true);
-    fgSetBool("/sim/hud/antialiased", false);
+    fgSetBool("/sim/sound/audible", true);
 
                                // Flight Model options
     fgSetString("/sim/flight-model", "jsb");
     fgSetString("/sim/aero", "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-ft", 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);
+    fgSetBool("/sim/rendering/horizon-effect", false);
+    fgSetBool("/sim/rendering/enhanced-lighting", false);
+    fgSetBool("/sim/rendering/distance-attenuation", 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/view/offset-deg", 0);
-    fgSetDouble("/environment/visibility-m", 20000);
+    fgSetDouble("/sim/current-view/heading-offset-deg", 0);
 
                                // HUD options
     fgSetString("/sim/startup/units", "feet");
@@ -189,11 +220,52 @@ fgSetDefaults ()
                                // Time options
     fgSetInt("/sim/startup/time-offset", 0);
     fgSetString("/sim/startup/time-offset-type", "system-offset");
+    fgSetLong("/sim/time/cur-time-override", 0);
 
     fgSetBool("/sim/networking/network-olk", false);
     fgSetString("/sim/networking/call-sign", "Johnny");
+
+                                // Freeze options
+    fgSetBool("/sim/freeze/master", false);
+    fgSetBool("/sim/freeze/position", false);
+    fgSetBool("/sim/freeze/clock", false);
+    fgSetBool("/sim/freeze/fuel", false);
+
+#ifdef FG_MPLAYER_AS
+    fgSetString("/sim/multiplay/callsign", "callsign");
+    fgSetString("/sim/multiplay/rxhost", "0");
+    fgSetString("/sim/multiplay/txhost", "0");
+    fgSetInt("/sim/multiplay/rxport", 0);
+    fgSetInt("/sim/multiplay/txport", 0);
+#endif
+
 }
 
+static bool
+parse_wind (const string &wind, double * min_hdg, double * max_hdg,
+           double * speed, double * gust)
+{
+  string::size_type pos = wind.find('@');
+  if (pos == string::npos)
+    return false;
+  string dir = wind.substr(0, pos);
+  string spd = wind.substr(pos+1);
+  pos = dir.find(':');
+  if (pos == string::npos) {
+    *min_hdg = *max_hdg = atof(dir.c_str());
+  } else {
+    *min_hdg = atof(dir.substr(0,pos).c_str());
+    *max_hdg = atof(dir.substr(pos+1).c_str());
+  }
+  pos = spd.find(':');
+  if (pos == string::npos) {
+    *speed = *gust = atof(spd.c_str());
+  } else {
+    *speed = atof(spd.substr(0,pos).c_str());
+    *gust = atof(spd.substr(pos+1).c_str());
+  }
+  return true;
+}
 
 // parse a time string ([+/-]%f[:%f[:%f]]) into hours
 static double
@@ -271,6 +343,8 @@ parse_time(const string& time_in) {
        result += seconds / 3600.0;
     }
 
+    SG_LOG( SG_GENERAL, SG_INFO, " parse_time() = " << sign * result );
+
     return(sign * result);
 }
 
@@ -422,7 +496,7 @@ parse_fov( const string& 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);
+    fgSetDouble("/sim/current-view/field-of-view", fov);
 
     // printf("parse_fov(): result = %.4f\n", fov);
 
@@ -446,38 +520,101 @@ parse_fov( const string& arg ) {
 //  baud = {300, 1200, 2400, ..., 230400}
 //
 // 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 
+static bool
 add_channel( const string& type, const string& channel_str ) {
-    // cout << "Channel string = " << channel_str << endl;
+    SG_LOG(SG_GENERAL, SG_INFO, "Channel string = " << channel_str );
 
     globals->get_channel_options_list()->push_back( type + "," + channel_str );
+    
+    // cout << "here" << endl;
 
     return true;
 }
 
 
+static void
+setup_wind (double min_hdg, double max_hdg, double speed, double gust)
+{
+                                // Initialize to a reasonable state
+  fgDefaultWeatherValue("wind-from-heading-deg", min_hdg);
+  fgDefaultWeatherValue("wind-speed-kt", speed);
+
+  SG_LOG(SG_GENERAL, SG_INFO, "WIND: " << min_hdg << '@' << 
+        speed << " knots" << endl);
+
+                                // Now, add some variety to the layers
+  min_hdg += 10;
+  if (min_hdg > 360)
+      min_hdg -= 360;
+  speed *= 1.2;
+  fgSetDouble("/environment/config/boundary/entry[1]/wind-from-heading-deg",
+              min_hdg);
+  fgSetDouble("/environment/config/boundary/entry[1]/wind-speed-kt",
+              speed);
+
+  min_hdg += 20;
+  if (min_hdg > 360)
+      min_hdg -= 360;
+  speed *= 1.5;
+  fgSetDouble("/environment/config/aloft/entry[0]/wind-from-heading-deg",
+              min_hdg);
+  fgSetDouble("/environment/config/aloft/entry[0]/wind-speed-kt",
+              speed);
+              
+  min_hdg += 10;
+  if (min_hdg > 360)
+      min_hdg -= 360;
+  speed *= 1.2;
+  fgSetDouble("/environment/config/aloft/entry[1]/wind-from-heading-deg",
+              min_hdg);
+  fgSetDouble("/environment/config/aloft/entry[1]/wind-speed-kt",
+              speed);
+              
+  min_hdg += 10;
+  if (min_hdg > 360)
+      min_hdg -= 360;
+  speed *= 1.2;
+  fgSetDouble("/environment/config/aloft/entry[2]/wind-from-heading-deg",
+              min_hdg);
+  fgSetDouble("/environment/config/aloft/entry[2]/wind-speed-kt",
+              speed);
+
+#ifdef FG_WEATHERCM
+  // convert to fps
+  speed *= SG_NM_TO_METER * SG_METER_TO_FEET * (1.0/3600);
+  while (min_hdg > 360)
+    min_hdg -= 360;
+  while (min_hdg <= 0)
+    min_hdg += 360;
+  min_hdg *= SGD_DEGREES_TO_RADIANS;
+  fgSetDouble("/environment/wind-from-north-fps", speed * cos(dir));
+  fgSetDouble("/environment/wind-from-east-fps", speed * sin(dir));
+#endif // FG_WEATHERCM
+}
+
+
 // Parse --wp=ID[@alt]
 static bool 
 parse_wp( const string& arg ) {
     string id, alt_str;
     double alt = 0.0;
 
-    unsigned int pos = arg.find( "@" );
+    string::size_type 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" ) {
+       if ( !strcmp(fgGetString("/sim/startup/units"), "feet") ) {
            alt *= SG_FEET_TO_METER;
        }
     } else {
@@ -527,497 +664,833 @@ parse_flightplan(const string& arg)
     return true;
 }
 
+static int
+fgOptLanguage( const char *arg )
+{
+    globals->set_locale( fgInitLocale( arg ) );
+    return FG_OPTIONS_OK;
+}
 
-// Parse a single option
-static int 
-parse_option (const string& arg) 
+static void
+clearLocation ()
 {
-    // General Options
-    if ( (arg == "--help") || (arg == "-h") ) {
-       // help/usage request
-       return(FG_OPTIONS_HELP);
-    } else if ( arg == "--disable-game-mode") {
-       fgSetBool("/sim/startup/game-mode", false);
-    } else if ( arg == "--enable-game-mode" ) {
-       fgSetBool("/sim/startup/game-mode", true);
-    } else if ( arg == "--disable-splash-screen" ) {
-       fgSetBool("/sim/startup/splash-screen", false); 
-    } else if ( arg == "--enable-splash-screen" ) {
-        fgSetBool("/sim/startup/splash-screen", true);
-    } else if ( arg == "--disable-intro-music" ) {
-       fgSetBool("/sim/startup/intro-music", false);
-    } else if ( arg == "--enable-intro-music" ) {
-       fgSetBool("/sim/startup/intro-music", true);
-    } else if ( arg == "--disable-mouse-pointer" ) {
-       fgSetString("/sim/startup/mouse-pointer", "disabled");
-    } else if ( arg == "--enable-mouse-pointer" ) {
-       fgSetString("/sim/startup/mouse-pointer", "enabled");
-    } else if ( arg == "--disable-freeze" ) {
-        fgSetBool("/sim/freeze", false);
-    } else if ( arg == "--enable-freeze" ) {
-        fgSetBool("/sim/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=") == 0 ) {
-        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.find( "--browser-app=") == 0 ) {
-       fgSetString("/sim/startup/browser-app", arg.substr(14));
-    } else if ( arg == "--disable-hud" ) {
-       fgSetBool("/sim/hud/visibility", false);
-    } else if ( arg == "--enable-hud" ) {
-       fgSetBool("/sim/hud/visibility", true);
-    } else if ( arg == "--disable-panel" ) {
-       fgSetBool("/sim/panel/visibility", false);
-    } else if ( arg == "--enable-panel" ) {
-       fgSetBool("/sim/panel/visibility", true);
-    } else if ( arg == "--disable-sound" ) {
-       fgSetBool("/sim/sound", false);
-    } else if ( arg == "--enable-sound" ) {
-       fgSetBool("/sim/sound", true);
-    } else if ( arg.find( "--airport-id=") == 0 ) {
-                               // NB: changed property name!!!
-       fgSetString("/sim/startup/airport-id", arg.substr(13));
-    } else if ( arg.find( "--offset-distance=") == 0 ) {
-       fgSetDouble("/sim/startup/offset-distance", atof(arg.substr(18)));
-    } else if ( arg.find( "--offset-azimuth=") == 0 ) {
-       fgSetDouble("/sim/startup/offset-azimuth", atof(arg.substr(17))); 
-    } else if ( arg.find( "--lon=" ) == 0 ) {
-       fgSetDouble("/position/longitude-deg",
-                             parse_degree(arg.substr(6)));
-       fgSetString("/sim/startup/airport-id", "");
-    } else if ( arg.find( "--lat=" ) == 0 ) {
-       fgSetDouble("/position/latitude-deg",
-                             parse_degree(arg.substr(6)));
-       fgSetString("/sim/startup/airport-id", "");
-    } else if ( arg.find( "--altitude=" ) == 0 ) {
-       fgSetBool("/sim/startup/onground", false);
-       if ( fgGetString("/sim/startup/units") == "feet" )
-           fgSetDouble("/position/altitude-ft", atof(arg.substr(11)));
-       else
-           fgSetDouble("/position/altitude-ft",
-                       atof(arg.substr(11)) * SG_METER_TO_FEET);
-    } else if ( arg.find( "--uBody=" ) == 0 ) {
-        fgSetString("/sim/startup/speed-set", "UVW");
-       if ( fgGetString("/sim/startup/units") == "feet" )
-         fgSetDouble("/velocities/uBody-fps", atof(arg.substr(8)));
-       else
-         fgSetDouble("/velocities/uBody-fps",
-                              atof(arg.substr(8)) * SG_METER_TO_FEET);
-    } else if ( arg.find( "--vBody=" ) == 0 ) {
-        fgSetString("/sim/startup/speed-set", "UVW");
-       if ( fgGetString("/sim/startup/units") == "feet" )
-         fgSetDouble("/velocities/vBody-fps", atof(arg.substr(8)));
-       else
-         fgSetDouble("/velocities/vBody-fps",
-                              atof(arg.substr(8)) * SG_METER_TO_FEET);
-    } else if ( arg.find( "--wBody=" ) == 0 ) {
-        fgSetString("/sim/startup/speed-set", "UVW");
-       if ( fgGetString("/sim/startup/units") == "feet" )
-         fgSetDouble("/velocities/wBody-fps", atof(arg.substr(8)));
-       else
-         fgSetDouble("/velocities/wBody-fps",
-                              atof(arg.substr(8)) * SG_METER_TO_FEET);
-    } else if ( arg.find( "--vNorth=" ) == 0 ) {
-        fgSetString("/sim/startup/speed-set", "NED");
-       if ( fgGetString("/sim/startup/units") == "feet" )
-         fgSetDouble("/velocities/speed-north-fps", atof(arg.substr(9)));
-       else
-         fgSetDouble("/velocities/speed-north-fps",
-                              atof(arg.substr(9)) * SG_METER_TO_FEET);
-    } else if ( arg.find( "--vEast=" ) == 0 ) {
-        fgSetString("/sim/startup/speed-set", "NED");
-       if ( fgGetString("/sim/startup/units") == "feet" )
-         fgSetDouble("/velocities/speed-east-fps", atof(arg.substr(8)));
-       else
-         fgSetDouble("/velocities/speed-east-fps",
-                     atof(arg.substr(8)) * SG_METER_TO_FEET);
-    } else if ( arg.find( "--vDown=" ) == 0 ) {
-        fgSetString("/sim/startup/speed-set", "NED");
-       if ( fgGetString("/sim/startup/units") == "feet" )
-         fgSetDouble("/velocities/speed-down-fps", atof(arg.substr(8)));
-       else
-         fgSetDouble("/velocities/speed-down-fps",
-                              atof(arg.substr(8)) * SG_METER_TO_FEET);
-    } else if ( arg.find( "--vc=" ) == 0) {
-        fgSetString("/sim/startup/speed-set", "knots");
-       fgSetDouble("/velocities/airspeed-kt", atof(arg.substr(5)));
-    } else if ( arg.find( "--mach=" ) == 0) {
-        fgSetString("/sim/startup/speed-set", "mach");
-       fgSetDouble("/velocities/mach", atof(arg.substr(7)));
-    } else if ( arg.find( "--heading=" ) == 0 ) {
-       fgSetDouble("/orientation/heading-deg", atof(arg.substr(10)));
-    } else if ( arg.find( "--roll=" ) == 0 ) {
-       fgSetDouble("/orientation/roll-deg", atof(arg.substr(7)));
-    } else if ( arg.find( "--pitch=" ) == 0 ) {
-       fgSetDouble("/orientation/pitch-deg", atof(arg.substr(8)));
-    } else if ( arg.find( "--fg-root=" ) == 0 ) {
-       globals->set_fg_root(arg.substr( 10 ));
-    } else if ( arg.find( "--fg-scenery=" ) == 0 ) {
-        globals->set_fg_scenery(arg.substr( 13 ));
-    } else if ( arg.find( "--fdm=" ) == 0 ) {
-       fgSetString("/sim/flight-model", arg.substr(6));
-    } else if ( arg.find( "--aero=" ) == 0 ) {
-       fgSetString("/sim/aero", arg.substr(7));
-    } else if ( arg.find( "--aircraft-dir=" ) == 0 ) {
-        fgSetString("/sim/aircraft-dir", arg.substr(15));
-    } else if ( arg.find( "--model-hz=" ) == 0 ) {
-       fgSetInt("/sim/model-hz", atoi(arg.substr(11)));
-    } else if ( arg.find( "--speed=" ) == 0 ) {
-       fgSetInt("/sim/speed-up", atoi(arg.substr(8)));
-    } else if ( arg.find( "--trim") == 0) {
-        fgSetBool("/sim/startup/trim", true);
-    } else if ( arg.find( "--notrim") == 0) {
-        fgSetBool("/sim/startup/trim", false);
-    } else if ( arg.find( "--on-ground") == 0) {
-        fgSetBool("/sim/startup/onground", true);
-    } else if ( arg.find( "--in-air") == 0) {
-        fgSetBool("/sim/startup/onground", false);
-    } else if ( arg == "--fog-disable" ) {
-       fgSetString("/sim/rendering/fog", "disabled");
-    } else if ( arg == "--fog-fastest" ) {
-       fgSetString("/sim/rendering/fog", "fastest");
-    } else if ( arg == "--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=" ) == 0 ) {
-                               // FIXME: check units
-        if ( fgGetString("/sim/startup/units") == "feet" )
-         fgSetDouble("/environment/clouds/altitude-ft",
-                               atof(arg.substr(13)) * SG_FEET_TO_METER);
-       else
-         fgSetDouble("/environment/clouds/altitude-ft",
-                               atof(arg.substr(13)));
-    } else if ( arg.find( "--fov=" ) == 0 ) {
-       parse_fov( arg.substr(6) );
-    } else if ( arg == "--disable-fullscreen" ) {
-        fgSetBool("/sim/startup/fullscreen", false);
-    } else if ( arg== "--enable-fullscreen") {
-        fgSetBool("/sim/startup/fullscreen", true);
-    } else if ( arg == "--shading-flat") {
-       fgSetBool("/sim/rendering/shading", false);
-    } else if ( arg == "--shading-smooth") {
-       fgSetBool("/sim/rendering/shading", true);
-    } else if ( arg == "--disable-skyblend") {
-       fgSetBool("/sim/rendering/skyblend", false);
-    } else if ( arg== "--enable-skyblend" ) {
-       fgSetBool("/sim/rendering/skyblend", true);
-    } else if ( arg == "--disable-textures" ) {
-        fgSetBool("/sim/rendering/textures", false);
-    } else if ( arg == "--enable-textures" ) {
-        fgSetBool("/sim/rendering/textures", true);
-    } else if ( arg == "--disable-wireframe" ) {
-        fgSetBool("/sim/rendering/wireframe", false);
-    } else if ( arg == "--enable-wireframe" ) {
-        fgSetBool("/sim/rendering/wireframe", true);
-    } else if ( arg.find( "--geometry=" ) == 0 ) {
-       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));
-       } else {
-           geometry_ok = false;
-       }
-
-       if ( xsize <= 0 || ysize <= 0 ) {
-           xsize = 640;
-           ysize = 480;
-           geometry_ok = false;
-       }
-
-       if ( !geometry_ok ) {
-           SG_LOG( SG_GENERAL, SG_ALERT, "Unknown geometry: " << geometry );
-           SG_LOG( SG_GENERAL, SG_ALERT,
-                   "Setting geometry to " << xsize << 'x' << ysize << '\n');
-       } else {
-         SG_LOG( SG_GENERAL, SG_INFO,
-                 "Setting geometry to " << xsize << 'x' << ysize << '\n');
-         fgSetInt("/sim/startup/xsize", xsize);
-         fgSetInt("/sim/startup/ysize", ysize);
-       }
-    } else if ( arg.find( "--bpp=" ) == 0 ) {
-       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 {
-         SG_LOG(SG_GENERAL, SG_ALERT, "Unsupported bpp " << bits_per_pix);
-       }
-    } else if ( arg == "--units-feet" ) {
-       fgSetString("/sim/startup/units", "feet");
-    } else if ( arg == "--units-meters" ) {
-       fgSetString("/sim/startup/units", "meters");
-    } else if ( arg.find( "--time-offset" ) == 0 ) {
-        fgSetInt("/sim/startup/time-offset",
-                          parse_time_offset( (arg.substr(14)) ));
-    } else if ( arg.find( "--time-match-real") == 0 ) {
-        fgSetString("/sim/startup/time-offset-type",
-                             "system-offset");
-    } else if ( arg.find( "--time-match-local") == 0 ) {
-        fgSetString("/sim/startup/time-offset-type",
-                             "latitude-offset");
-    } else if ( arg.find( "--start-date-sys=") == 0 ) {
-        fgSetInt("/sim/startup/time-offset",
-                          parse_date((arg.substr(17))));
-       fgSetString("/sim/startup/time-offset-type", "system");
-    } else if ( arg.find( "--start-date-lat=") == 0 ) {
-        fgSetInt("/sim/startup/time-offset",
-                          parse_date((arg.substr(17))));
-       fgSetString("/sim/startup/time-offset-type",
-                          "latitude");
-    } else if ( arg.find( "--start-date-gmt=") == 0 ) {
-        fgSetInt("/sim/startup/time-offset",
-                          parse_date((arg.substr(17))));
-       fgSetString("/sim/startup/time-offset-type", "gmt");
-    } else if ( arg == "--hud-tris" ) {
-        fgSetString("/sim/hud/frame-stat-type", "tris");
-    } else if ( arg == "--hud-culled" ) {
-        fgSetString("/sim/hud/frame-stat-type", "culled");
-    } else if ( arg.find( "--atlas=" ) == 0 ) {
-       add_channel( "atlas", arg.substr(8) );
-    } else if ( arg.find( "--httpd=" ) == 0 ) {
-       add_channel( "httpd", arg.substr(8) );
-    } else if ( arg.find( "--native=" ) == 0 ) {
-       add_channel( "native", arg.substr(9) );
-    } else if ( arg.find( "--native-ctrls=" ) == 0 ) {
-       add_channel( "native_ctrls", arg.substr(15) );
-    } else if ( arg.find( "--native-fdm=" ) == 0 ) {
-       add_channel( "native_fdm", arg.substr(13) );
-    } else if ( arg.find( "--opengc=" ) == 0 ) {
-       // char stop;
-       // cout << "Adding channel for OpenGC Display" << endl; cin >> stop;
-       add_channel( "opengc", arg.substr(9) );
-    } else if ( arg.find( "--garmin=" ) == 0 ) {
-       add_channel( "garmin", arg.substr(9) );
-    } else if ( arg.find( "--nmea=" ) == 0 ) {
-       add_channel( "nmea", arg.substr(7) );
-    } else if ( arg.find( "--props=" ) == 0 ) {
-       add_channel( "props", arg.substr(8) );
-    } else if ( arg.find( "--pve=" ) == 0 ) {
-       add_channel( "pve", arg.substr(6) );
-    } else if ( arg.find( "--ray=" ) == 0 ) {
-       add_channel( "ray", arg.substr(6) );
-    } else if ( arg.find( "--rul=" ) == 0 ) {
-       add_channel( "rul", arg.substr(6) );
-    } else if ( arg.find( "--joyclient=" ) == 0 ) {
-       add_channel( "joyclient", arg.substr(12) );
+    fgSetString("/sim/presets/airport-id", "");
+    fgSetString("/sim/presets/vor-id", "");
+    fgSetString("/sim/presets/ndb-id", "");
+    fgSetString("/sim/presets/fix", "");
+}
+
+static int
+fgOptVOR( const char * arg )
+{
+    clearLocation();
+    fgSetString("/sim/presets/vor-id", arg);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptNDB( const char * arg )
+{
+    clearLocation();
+    fgSetString("/sim/presets/ndb-id", arg);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptFIX( const char * arg )
+{
+    clearLocation();
+    fgSetString("/sim/presets/fix", arg);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptLon( const char *arg )
+{
+    clearLocation();
+    fgSetDouble("/sim/presets/longitude-deg", parse_degree( arg ));
+    fgSetDouble("/position/longitude-deg", parse_degree( arg ));
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptLat( const char *arg )
+{
+    clearLocation();
+    fgSetDouble("/sim/presets/latitude-deg", parse_degree( arg ));
+    fgSetDouble("/position/latitude-deg", parse_degree( arg ));
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptAltitude( const char *arg )
+{
+    fgSetBool("/sim/presets/onground", false);
+    if ( !strcmp(fgGetString("/sim/startup/units"), "feet") )
+        fgSetDouble("/sim/presets/altitude-ft", atof( arg ));
+    else
+        fgSetDouble("/sim/presets/altitude-ft",
+                   atof( arg ) * SG_METER_TO_FEET);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptUBody( const char *arg )
+{
+    fgSetString("/sim/presets/speed-set", "UVW");
+    if ( !strcmp(fgGetString("/sim/startup/units"), "feet") )
+       fgSetDouble("/sim/presets/uBody-fps", atof( arg ));
+    else
+       fgSetDouble("/sim/presets/uBody-fps",
+                    atof( arg ) * SG_METER_TO_FEET);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptVBody( const char *arg )
+{
+    fgSetString("/sim/presets/speed-set", "UVW");
+    if ( !strcmp(fgGetString("/sim/startup/units"), "feet") )
+       fgSetDouble("/sim/presets/vBody-fps", atof( arg ));
+    else
+       fgSetDouble("/sim/presets/vBody-fps",
+                           atof( arg ) * SG_METER_TO_FEET);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptWBody( const char *arg )
+{
+    fgSetString("/sim/presets/speed-set", "UVW");
+    if ( !strcmp(fgGetString("/sim/startup/units"), "feet") )
+       fgSetDouble("/sim/presets/wBody-fps", atof(arg));
+    else
+       fgSetDouble("/sim/presets/wBody-fps",
+                           atof(arg) * SG_METER_TO_FEET);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptVNorth( const char *arg )
+{
+    fgSetString("/sim/presets/speed-set", "NED");
+    if ( !strcmp(fgGetString("/sim/startup/units"), "feet") )
+       fgSetDouble("/sim/presets/speed-north-fps", atof( arg ));
+    else
+       fgSetDouble("/sim/presets/speed-north-fps",
+                           atof( arg ) * SG_METER_TO_FEET);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptVEast( const char *arg )
+{
+    fgSetString("/sim/presets/speed-set", "NED");
+    if ( !strcmp(fgGetString("/sim/startup/units"), "feet") )
+       fgSetDouble("/sim/presets/speed-east-fps", atof(arg));
+    else
+       fgSetDouble("/sim/presets/speed-east-fps",
+                   atof(arg) * SG_METER_TO_FEET);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptVDown( const char *arg )
+{
+    fgSetString("/sim/presets/speed-set", "NED");
+    if ( !strcmp(fgGetString("/sim/startup/units"), "feet") )
+       fgSetDouble("/sim/presets/speed-down-fps", atof(arg));
+    else
+       fgSetDouble("/sim/presets/speed-down-fps",
+                           atof(arg) * SG_METER_TO_FEET);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptVc( const char *arg )
+{
+    // fgSetString("/sim/presets/speed-set", "knots");
+    // fgSetDouble("/velocities/airspeed-kt", atof(arg.substr(5)));
+    fgSetString("/sim/presets/speed-set", "knots");
+    fgSetDouble("/sim/presets/airspeed-kt", atof(arg));
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptMach( const char *arg )
+{
+    fgSetString("/sim/presets/speed-set", "mach");
+    fgSetDouble("/sim/presets/mach", atof(arg));
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptRoc( const char *arg )
+{
+    fgSetDouble("/velocities/vertical-speed-fps", atof(arg)/60);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptFgRoot( const char *arg )
+{
+    globals->set_fg_root(arg);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptFgScenery( const char *arg )
+{
+    globals->set_fg_scenery(arg);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptFov( const char *arg )
+{
+    parse_fov( arg );
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptGeometry( const char *arg )
+{
+    bool geometry_ok = true;
+    int xsize = 0, ysize = 0;
+    string geometry = arg;
+    string::size_type i = geometry.find('x');
+
+    if (i != string::npos) {
+        xsize = atoi(geometry.substr(0, i));
+        ysize = atoi(geometry.substr(i+1));
+    } else {
+        geometry_ok = false;
+    }
+
+    if ( xsize <= 0 || ysize <= 0 ) {
+        xsize = 640;
+        ysize = 480;
+        geometry_ok = false;
+    }
+
+    if ( !geometry_ok ) {
+        SG_LOG( SG_GENERAL, SG_ALERT, "Unknown geometry: " << geometry );
+        SG_LOG( SG_GENERAL, SG_ALERT,
+               "Setting geometry to " << xsize << 'x' << ysize << '\n');
+    } else {
+        SG_LOG( SG_GENERAL, SG_INFO,
+               "Setting geometry to " << xsize << 'x' << ysize << '\n');
+        fgSetInt("/sim/startup/xsize", xsize);
+        fgSetInt("/sim/startup/ysize", ysize);
+    }
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptBpp( const char *arg )
+{
+    string bits_per_pix = arg;
+    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 {
+       SG_LOG(SG_GENERAL, SG_ALERT, "Unsupported bpp " << bits_per_pix);
+    }
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptTimeOffset( const char *arg )
+{
+    fgSetInt("/sim/startup/time-offset",
+                parse_time_offset( arg ));
+    fgSetString("/sim/startup/time-offset-type", "system-offset");
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptStartDateSys( const char *arg )
+{
+    fgSetInt("/sim/startup/time-offset", parse_date( arg ) );
+    fgSetString("/sim/startup/time-offset-type", "system");
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptStartDateLat( const char *arg )
+{
+    fgSetInt("/sim/startup/time-offset", parse_date( arg ) );
+    fgSetString("/sim/startup/time-offset-type", "latitude");
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptStartDateGmt( const char *arg )
+{
+    fgSetInt("/sim/startup/time-offset", parse_date( arg ) );
+    fgSetString("/sim/startup/time-offset-type", "gmt");
+    return FG_OPTIONS_OK;
+}
+
 #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" ) {
-        fgSetBool("/sim/hud/net-display", true);
-       net_hud_display = 1;    // FIXME
-    } else if ( arg.find( "--net-id=") == 0 ) {
-        fgSetString("sim/networking/call-sign", arg.substr(9));
+static int
+fgOptNetHud( const char *arg )
+{
+    fgSetBool("/sim/hud/net-display", true);
+    net_hud_display = 1;       // FIXME
+    return FG_OPTIONS_OK;
+}
 #endif
-    } else if ( arg.find( "--prop:" ) == 0 ) {
-        string assign = arg.substr(7);
-       unsigned int pos = assign.find('=');
-       if ( pos == arg.npos || pos == 0 ) {
-           SG_LOG( SG_GENERAL, SG_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);
-       // SG_LOG(SG_GENERAL, SG_INFO, "Setting default value of property "
-       //        << name << " to \"" << value << '"');
-    } else if ( arg.find("--trace-read=") == 0) {
-        string name = arg.substr(13);
-       SG_LOG(SG_GENERAL, SG_INFO, "Tracing reads for property " << name);
-       fgGetNode(name, true)->setAttribute(SGPropertyNode::TRACE_READ, true);
-    } else if ( arg.find("--trace-write=") == 0) {
-        string name = arg.substr(14);
-       SG_LOG(SG_GENERAL, SG_INFO, "Tracing writes for property " << name);
-       fgGetNode(name, true)->setAttribute(SGPropertyNode::TRACE_WRITE, true);
-    } else if ( arg.find( "--view-offset=" ) == 0 ) {
-        // $$$ begin - added VS Renganathan, 14 Oct 2K
-        // for multi-window outside window imagery
-       string woffset = arg.substr( 14 );
-       double default_view_offset = 0.0;
-       if ( woffset == "LEFT" ) {
-              default_view_offset = SGD_PI * 0.25;
-       } else if ( woffset == "RIGHT" ) {
-           default_view_offset = SGD_PI * 1.75;
-       } else if ( woffset == "CENTER" ) {
-           default_view_offset = 0.00;
-       } else {
-           default_view_offset = atof( woffset.c_str() ) * SGD_DEGREES_TO_RADIANS;
-       }
-       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/view/offset-deg", default_view_offset);
-    // $$$ end - added VS Renganathan, 14 Oct 2K
-    } else if ( arg.find( "--visibility=" ) == 0 ) {
-       fgSetDouble("/environment/visibility-m", atof(arg.substr(13)));
-    } else if ( arg.find( "--visibility-miles=" ) == 0 ) {
-        double visibility = atof(arg.substr(19)) * 5280.0 * SG_FEET_TO_METER;
-       fgSetDouble("/environment/visibility-m", visibility);
-    } else if ( arg.find( "--wind=" ) == 0 ) {
-        string val = arg.substr(7);
-       unsigned int pos = val.find('@');
-       if ( pos == string::npos ) {
-         SG_LOG( SG_GENERAL, SG_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());
-       SG_LOG(SG_GENERAL, SG_INFO, "WIND: " << dir << '@' << 
-              speed << " knots" << endl);
-       fgSetDouble("/environment/wind-from-heading-deg", dir);
-       fgSetDouble("/environment/wind-speed-knots", speed);
-
-        // convert to fps
-       speed *= SG_NM_TO_METER * SG_METER_TO_FEET * (1.0/3600);
-       // dir += 180;
-       if (dir >= 360)
-         dir -= 360;
-       dir *= SGD_DEGREES_TO_RADIANS;
-       fgSetDouble("/environment/wind-north-fps",
-                   speed * cos(dir));
-       fgSetDouble("/environment/wind-east-fps",
-                   speed * sin(dir));
-    } else if ( arg.find( "--wp=" ) == 0 ) {
-       parse_wp( arg.substr( 5 ) );
-    } else if ( arg.find( "--flight-plan=") == 0) {
-       parse_flightplan ( arg.substr (14) );
-    } else if ( arg.find( "--config=" ) == 0 ) {
-        string file = arg.substr(9);
-       try {
-         readProperties(file, globals->get_props());
-       } catch (const sg_exception &e) {
-         string message = "Error loading config file: ";
-         message += e.getFormattedMessage();
-         SG_LOG(SG_INPUT, SG_ALERT, message);
-         exit(2);
-       }
-    } else if ( arg.find( "--aircraft=" ) == 0 ) {
-        // read in the top level aircraft definition file
-        SGPath apath( globals->get_fg_root() );
-        apath.append( "Aircraft" );
-        apath.append( arg.substr(11) );
-        apath.concat( "-set.xml" );
-        try {
-            readProperties( apath.str(), globals->get_props() );
-        } catch (const sg_exception &e) {
-            string message = "Error loading aircraft file: ";
-            message += e.getFormattedMessage();
-            SG_LOG(SG_INPUT, SG_ALERT, message);
-            exit(2);
-        }
+
+static int
+fgOptTraceRead( const char *arg )
+{
+    string name = arg;
+    SG_LOG(SG_GENERAL, SG_INFO, "Tracing reads for property " << name);
+    fgGetNode(name.c_str(), true)
+       ->setAttribute(SGPropertyNode::TRACE_READ, true);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptTraceWrite( const char *arg )
+{
+    string name = arg;
+    SG_LOG(SG_GENERAL, SG_INFO, "Tracing writes for property " << name);
+    fgGetNode(name.c_str(), true)
+       ->setAttribute(SGPropertyNode::TRACE_WRITE, true);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptViewOffset( const char *arg )
+{
+    // $$$ begin - added VS Renganathan, 14 Oct 2K
+    // for multi-window outside window imagery
+    string woffset = arg;
+    double default_view_offset = 0.0;
+    if ( woffset == "LEFT" ) {
+           default_view_offset = SGD_PI * 0.25;
+    } else if ( woffset == "RIGHT" ) {
+       default_view_offset = SGD_PI * 1.75;
+    } else if ( woffset == "CENTER" ) {
+       default_view_offset = 0.00;
     } else {
-       SG_LOG( SG_GENERAL, SG_ALERT, "Unknown option '" << arg << "'" );
-       return FG_OPTIONS_ERROR;
+       default_view_offset = atof( woffset.c_str() ) * SGD_DEGREES_TO_RADIANS;
     }
-    
+    /* apparently not used (CLO, 11 Jun 2002) 
+        FGViewer *pilot_view =
+           (FGViewer *)globals->get_viewmgr()->get_view( 0 ); */
+    // this will work without calls to the viewer...
+    fgSetDouble( "/sim/current-view/heading-offset-deg",
+                    default_view_offset  * SGD_RADIANS_TO_DEGREES );
+    // $$$ end - added VS Renganathan, 14 Oct 2K
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptVisibilityMeters( const char *arg )
+{
+    double visibility = atof( arg );
+    fgDefaultWeatherValue("visibility-m", visibility);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptVisibilityMiles( const char *arg )
+{
+    double visibility = atof( arg ) * 5280.0 * SG_FEET_TO_METER;
+    fgDefaultWeatherValue("visibility-m", visibility);
     return FG_OPTIONS_OK;
 }
 
+static int
+fgOptRandomWind( const char *arg )
+{
+    double min_hdg = sg_random() * 360.0;
+    double max_hdg = min_hdg + (20 - sqrt(sg_random() * 400));
+    double speed = 40 - sqrt(sg_random() * 1600.0);
+    double gust = speed + (10 - sqrt(sg_random() * 100));
+    setup_wind(min_hdg, max_hdg, speed, gust);
+    return FG_OPTIONS_OK;
+}
 
-// Scan the command line options for an fg_root definition and set
-// just that.
-string
-fgScanForRoot (int argc, char **argv) 
+static int
+fgOptWind( const char *arg )
 {
-    int i = 1;
+    double min_hdg, max_hdg, speed, gust;
+    if (!parse_wind( arg, &min_hdg, &max_hdg, &speed, &gust)) {
+       SG_LOG( SG_GENERAL, SG_ALERT, "bad wind value " << arg );
+       return FG_OPTIONS_ERROR;
+    }
+    setup_wind(min_hdg, max_hdg, speed, gust);
+    return FG_OPTIONS_OK;
+}
 
-    SG_LOG(SG_GENERAL, SG_INFO, "Scanning for root: command line");
+static int
+fgOptTurbulence( const char *arg)
+{
+    fgDefaultWeatherValue("turbulence/magnitude-norm", atof(arg));
+    return FG_OPTIONS_OK;
+}
 
-    while ( i < argc ) {
-       SG_LOG( SG_GENERAL, SG_DEBUG, "argv[" << i << "] = " << argv[i] );
+static int
+fgOptWp( const char *arg )
+{
+    parse_wp( arg );
+    return FG_OPTIONS_OK;
+}
 
-       string arg = argv[i];
-       if ( arg.find( "--fg-root=" ) == 0 ) {
-           return arg.substr( 10 );
-       }
+static int
+fgOptFlightPlan( const char *arg )
+{
+    parse_flightplan ( arg );
+    return FG_OPTIONS_OK;
+}
 
-       i++;
+static int
+fgOptConfig( const char *arg )
+{
+    string file = arg;
+    try {
+       readProperties(file, globals->get_props());
+    } catch (const sg_exception &e) {
+       string message = "Error loading config file: ";
+       message += e.getFormattedMessage();
+       SG_LOG(SG_INPUT, SG_ALERT, message);
+       exit(2);
     }
+    return FG_OPTIONS_OK;
+}
 
-    return "";
+static bool
+parse_colon (const string &s, double * val1, double * val2)
+{
+    string::size_type pos = s.find(':');
+    if (pos == string::npos) {
+        *val2 = atof(s);
+        return false;
+    } else {
+        *val1 = atof(s.substr(0, pos).c_str());
+        *val2 = atof(s.substr(pos+1).c_str());
+        return true;
+    }
 }
 
 
-// Scan the config file for an fg_root definition and set just that.
-string
-fgScanForRoot (const string& path)
+static int
+fgOptNAV1( const char * arg )
 {
-    sg_gzifstream in( path );
-    if ( !in.is_open() )
-      return "";
+    double radial, freq;
+    if (parse_colon(arg, &radial, &freq))
+        fgSetDouble("/radios/nav[0]/radials/selected-deg", radial);
+    fgSetDouble("/radios/nav[0]/frequencies/selected-mhz", freq);
+    return FG_OPTIONS_OK;
+}
 
-    SG_LOG( SG_GENERAL, SG_INFO, "Scanning for root: " << path );
+static int
+fgOptNAV2( const char * arg )
+{
+    double radial, freq;
+    if (parse_colon(arg, &radial, &freq))
+        fgSetDouble("/radios/nav[1]/radials/selected-deg", radial);
+    fgSetDouble("/radios/nav[1]/frequencies/selected-mhz", freq);
+    return FG_OPTIONS_OK;
+}
 
-    in >> skipcomment;
-#ifndef __MWERKS__
-    while ( ! in.eof() ) {
-#else
-    char c = '\0';
-    while ( in.get(c) && c != '\0' ) {
-       in.putback(c);
-#endif
-       string line;
+static int
+fgOptADF( const char * arg )
+{
+    double rot, freq;
+    if (parse_colon(arg, &rot, &freq))
+        fgSetDouble("/radios/kr-87/inputs/rotation-deg", rot);
+    fgSetDouble("/radios/kr-87/outputs/selected-khz", freq);
+    return FG_OPTIONS_OK;
+}
 
-#if defined( macintosh )
-        getline( in, line, '\r' );
-#else
-       getline( in, line, '\n' );
+static int
+fgOptDME( const char *arg )
+{
+    string opt = arg;
+    if (opt == "nav1") {
+        fgSetInt("/instrumentation/dme/switch-position", 1);
+        fgSetString("/instrumentation/dme/frequencies/source",
+                    "/radios/nav[0]/frequencies/selected-mhz");
+    } else if (opt == "nav2") {
+        fgSetInt("/instrumentation/dme/switch-position", 3);
+        fgSetString("/instrumentation/dme/frequencies/source",
+                    "/radios/nav[1]/frequencies/selected-mhz");
+    } else {
+        fgSetInt("/instrumentation/dme/switch-position", 2);
+        fgSetString("/instrumentation/dme/frequencies/source",
+                    "/instrumentation/dme/frequencies/selected-mhz");
+        fgSetString("/instrumentation/dme/frequencies/selected-mhz", arg);
+    }
+    return FG_OPTIONS_OK;
+}
+
+static map<string,size_t> fgOptionMap;
+
+/*
+   option       has_param type        property         b_param s_param  func
+
+where:
+ option    : name of the option
+ has_param : option is --name=value if true or --name if false
+ type      : OPTION_BOOL    - property is a boolean
+             OPTION_STRING  - property is a string
+             OPTION_DOUBLE  - property is a double
+             OPTION_INT     - property is an integer
+             OPTION_CHANNEL - name of option is the name of a channel
+             OPTION_FUNC    - the option trigger a function
+ b_param   : if type==OPTION_BOOL,
+             value set to the property (has_param is false for boolean)
+ s_param   : if type==OPTION_STRING,
+             value set to the property if has_param is false
+ func      : function called if type==OPTION_FUNC. if has_param is true,
+             the value is passed to the function as a string, otherwise,
+             0 is passed. 
+
+    For OPTION_DOUBLE and OPTION_INT, the parameter value is converted into a
+    double or an integer and set to the property.
+
+    For OPTION_CHANNEL, add_channel is called with the parameter value as the
+    argument.
+*/
+
+enum OptionType { OPTION_BOOL, OPTION_STRING, OPTION_DOUBLE, OPTION_INT, OPTION_CHANNEL, OPTION_FUNC };
+struct OptionDesc {
+    char *option;
+    bool has_param;
+    enum OptionType type;
+    char *property;
+    bool b_param;
+    char *s_param;
+    int (*func)( const char * );
+    } fgOptionArray[] = {
+       
+    {"language",                     true,  OPTION_FUNC,   "", false, "", fgOptLanguage },
+    {"disable-game-mode",            false, OPTION_BOOL,   "/sim/startup/game-mode", false, "", 0 },
+    {"enable-game-mode",             false, OPTION_BOOL,   "/sim/startup/game-mode", true, "", 0 },
+    {"disable-splash-screen",        false, OPTION_BOOL,   "/sim/startup/splash-screen", false, "", 0 },
+    {"enable-splash-screen",         false, OPTION_BOOL,   "/sim/startup/splash-screen", true, "", 0 },
+    {"disable-intro-music",          false, OPTION_BOOL,   "/sim/startup/intro-music", false, "", 0 },
+    {"enable-intro-music",           false, OPTION_BOOL,   "/sim/startup/intro-music", true, "", 0 },
+    {"disable-mouse-pointer",        false, OPTION_STRING, "/sim/startup/mouse-pointer", false, "disabled", 0 },
+    {"enable-mouse-pointer",         false, OPTION_STRING, "/sim/startup/mouse-pointer", false, "enabled", 0 },
+    {"disable-random-objects",       false, OPTION_BOOL,   "/sim/rendering/random-objects", false, "", 0 },
+    {"enable-random-objects",        false, OPTION_BOOL,   "/sim/rendering/random-objects", true, "", 0 },
+    {"disable-freeze",               false, OPTION_BOOL,   "/sim/freeze/master", false, "", 0 },
+    {"enable-freeze",                false, OPTION_BOOL,   "/sim/freeze/master", true, "", 0 },
+    {"disable-fuel-freeze",          false, OPTION_BOOL,   "/sim/freeze/fuel", false, "", 0 },
+    {"enable-fuel-freeze",           false, OPTION_BOOL,   "/sim/freeze/fuel", true, "", 0 },
+    {"disable-clock-freeze",         false, OPTION_BOOL,   "/sim/freeze/clock", false, "", 0 },
+    {"enable-clock-freeze",          false, OPTION_BOOL,   "/sim/freeze/clock", true, "", 0 },
+    {"disable-hud-3d",               false, OPTION_BOOL,   "/sim/hud/enable3d", false, "", 0 },
+    {"enable-hud-3d",                false, OPTION_BOOL,   "/sim/hud/enable3d", true, "", 0 },
+    {"disable-anti-alias-hud",       false, OPTION_BOOL,   "/sim/hud/antialiased", false, "", 0 },
+    {"enable-anti-alias-hud",        false, OPTION_BOOL,   "/sim/hud/antialiased", true, "", 0 },
+    {"control",                      true,  OPTION_STRING, "/sim/control-mode", false, "", 0 },
+    {"disable-auto-coordination",    false, OPTION_BOOL,   "/sim/auto-coordination", false, "", 0 },
+    {"enable-auto-coordination",     false, OPTION_BOOL,   "/sim/auto-coordination", true, "", 0 },
+    {"browser-app",                  true,  OPTION_STRING, "/sim/startup/browser-app", false, "", 0 },
+    {"disable-hud",                  false, OPTION_BOOL,   "/sim/hud/visibility", false, "", 0 },
+    {"enable-hud",                   false, OPTION_BOOL,   "/sim/hud/visibility", true, "", 0 },
+    {"disable-panel",                false, OPTION_BOOL,   "/sim/panel/visibility", false, "", 0 },
+    {"enable-panel",                 false, OPTION_BOOL,   "/sim/panel/visibility", true, "", 0 },
+    {"disable-sound",                false, OPTION_BOOL,   "/sim/sound/audible", false, "", 0 },
+    {"enable-sound",                 false, OPTION_BOOL,   "/sim/sound/audible", true, "", 0 },
+    {"airport",                      true,  OPTION_STRING, "/sim/presets/airport-id", false, "", 0 },
+    {"airport-id",                   true,  OPTION_STRING, "/sim/presets/airport-id", false, "", 0 },
+    {"runway",                       true,  OPTION_STRING, "/sim/presets/runway", false, "", 0 },
+    {"vor",                          true,  OPTION_FUNC,   "", false, "", fgOptVOR },
+    {"ndb",                          true,  OPTION_FUNC,   "", false, "", fgOptNDB },
+    {"fix",                          true,  OPTION_FUNC,   "", false, "", fgOptFIX },
+    {"offset-distance",              true,  OPTION_DOUBLE, "/sim/presets/offset-distance", false, "", 0 },
+    {"offset-azimuth",               true,  OPTION_DOUBLE, "/sim/presets/offset-azimuth", false, "", 0 },
+    {"lon",                          true,  OPTION_FUNC,   "", false, "", fgOptLon },
+    {"lat",                          true,  OPTION_FUNC,   "", false, "", fgOptLat },
+    {"altitude",                     true,  OPTION_FUNC,   "", false, "", fgOptAltitude },
+    {"uBody",                        true,  OPTION_FUNC,   "", false, "", fgOptUBody },
+    {"vBody",                        true,  OPTION_FUNC,   "", false, "", fgOptVBody },
+    {"wBody",                        true,  OPTION_FUNC,   "", false, "", fgOptWBody },
+    {"vNorth",                       true,  OPTION_FUNC,   "", false, "", fgOptVNorth },
+    {"vEast",                        true,  OPTION_FUNC,   "", false, "", fgOptVEast },
+    {"vDown",                        true,  OPTION_FUNC,   "", false, "", fgOptVDown },
+    {"vc",                           true,  OPTION_FUNC,   "", false, "", fgOptVc },
+    {"mach",                         true,  OPTION_FUNC,   "", false, "", fgOptMach },
+    {"heading",                      true,  OPTION_DOUBLE, "/sim/presets/heading-deg", false, "", 0 },
+    {"roll",                         true,  OPTION_DOUBLE, "/sim/presets/roll-deg", false, "", 0 },
+    {"pitch",                        true,  OPTION_DOUBLE, "/sim/presets/pitch-deg", false, "", 0 },
+    {"glideslope",                   true,  OPTION_DOUBLE, "/sim/presets/glideslope-deg", false, "", 0 },
+    {"roc",                          true,  OPTION_FUNC,   "", false, "", fgOptRoc },
+    {"fg-root",                      true,  OPTION_FUNC,   "", false, "", fgOptFgRoot },
+    {"fg-scenery",                   true,  OPTION_FUNC,   "", false, "", fgOptFgScenery },
+    {"fdm",                          true,  OPTION_STRING, "/sim/flight-model", false, "", 0 },
+    {"aero",                         true,  OPTION_STRING, "/sim/aero", false, "", 0 },
+    {"aircraft-dir",                 true,  OPTION_STRING, "/sim/aircraft-dir", false, "", 0 },
+    {"model-hz",                     true,  OPTION_INT,    "/sim/model-hz", false, "", 0 },
+    {"speed",                        true,  OPTION_INT,    "/sim/speed-up", false, "", 0 },
+    {"trim",                         false, OPTION_BOOL,   "/sim/presets/trim", true, "", 0 },
+    {"notrim",                       false, OPTION_BOOL,   "/sim/presets/trim", false, "", 0 },
+    {"on-ground",                    false, OPTION_BOOL,   "/sim/presets/onground", true, "", 0 },
+    {"in-air",                       false, OPTION_BOOL,   "/sim/presets/onground", false, "", 0 },
+    {"fog-disable",                  false, OPTION_STRING, "/sim/rendering/fog", false, "disabled", 0 },
+    {"fog-fastest",                  false, OPTION_STRING, "/sim/rendering/fog", false, "fastest", 0 },
+    {"fog-nicest",                   false, OPTION_STRING, "/sim/rendering/fog", false, "nicest", 0 },
+    {"disable-horizon-effect",       false, OPTION_BOOL,   "/sim/rendering/horizon-effect", false, "", 0 },
+    {"enable-horizon-effect",        false, OPTION_BOOL,   "/sim/rendering/horizon-effect", true, "", 0 },
+    {"disable-enhanced-lighting",    false, OPTION_BOOL,   "/sim/rendering/enhanced-lighting", false, "", 0 },
+    {"enable-enhanced-lighting",     false, OPTION_BOOL,   "/sim/rendering/enhanced-lighting", true, "", 0 },
+    {"disable-distance-attenuation", false, OPTION_BOOL,   "/sim/rendering/distance-attenuation", false, "", 0 },
+    {"enable-distance-attenuation",  false, OPTION_BOOL,   "/sim/rendering/distance-attenuation", true, "", 0 },
+    {"disable-clouds",               false, OPTION_BOOL,   "/environment/clouds/status", false, "", 0 },
+    {"enable-clouds",                false, OPTION_BOOL,   "/environment/clouds/status", true, "", 0 },
+#ifdef FG_USE_CLOUDS_3D
+    {"disable-clouds3d",             false, OPTION_BOOL,   "/sim/rendering/clouds3d", false, "", 0 },
+    {"enable-clouds3d",              false, OPTION_BOOL,   "/sim/rendering/clouds3d", true, "", 0 },
+#endif
+    {"fov",                          true,  OPTION_FUNC,   "", false, "", fgOptFov },
+    {"disable-fullscreen",           false, OPTION_BOOL,   "/sim/startup/fullscreen", false, "", 0 },
+    {"enable-fullscreen",            false, OPTION_BOOL,   "/sim/startup/fullscreen", true, "", 0 },
+    {"shading-flat",                 false, OPTION_BOOL,   "/sim/rendering/shading", false, "", 0 },
+    {"shading-smooth",               false, OPTION_BOOL,   "/sim/rendering/shading", true, "", 0 },
+    {"disable-skyblend",             false, OPTION_BOOL,   "/sim/rendering/skyblend", false, "", 0 },
+    {"enable-skyblend",              false, OPTION_BOOL,   "/sim/rendering/skyblend", true, "", 0 },
+    {"disable-textures",             false, OPTION_BOOL,   "/sim/rendering/textures", false, "", 0 },
+    {"enable-textures",              false, OPTION_BOOL,   "/sim/rendering/textures", true, "", 0 },
+    {"disable-wireframe",            false, OPTION_BOOL,   "/sim/rendering/wireframe", false, "", 0 },
+    {"enable-wireframe",             false, OPTION_BOOL,   "/sim/rendering/wireframe", true, "", 0 },
+    {"geometry",                     true,  OPTION_FUNC,   "", false, "", fgOptGeometry },
+    {"bpp",                          true,  OPTION_FUNC,   "", false, "", fgOptBpp },
+    {"units-feet",                   false, OPTION_STRING, "/sim/startup/units", false, "feet", 0 },
+    {"units-meters",                 false, OPTION_STRING, "/sim/startup/units", false, "meters", 0 },
+    {"time-offset",                  true,  OPTION_FUNC,   "", false, "", fgOptTimeOffset },
+    {"time-match-real",              false, OPTION_STRING, "/sim/startup/time-offset-type", false, "system-offset", 0 },
+    {"time-match-local",             false, OPTION_STRING, "/sim/startup/time-offset-type", false, "latitude-offset", 0 },
+    {"start-date-sys",               true,  OPTION_FUNC,   "", false, "", fgOptStartDateSys },
+    {"start-date-lat",               true,  OPTION_FUNC,   "", false, "", fgOptStartDateLat },
+    {"start-date-gmt",               true,  OPTION_FUNC,   "", false, "", fgOptStartDateGmt },
+    {"hud-tris",                     false, OPTION_STRING, "/sim/hud/frame-stat-type", false, "tris", 0 },
+    {"hud-culled",                   false, OPTION_STRING, "/sim/hud/frame-stat-type", false, "culled", 0 },
+    {"atc610x",                      true,  OPTION_CHANNEL, "", false, "dummy", 0 },
+    {"atlas",                        true,  OPTION_CHANNEL, "", false, "", 0 },
+    {"httpd",                        true,  OPTION_CHANNEL, "", false, "", 0 },
+#ifdef FG_JPEG_SERVER
+    {"jpg-httpd",                    true,  OPTION_CHANNEL, "", false, "", 0 },
 #endif
+    {"native",                       true,  OPTION_CHANNEL, "", false, "", 0 },
+    {"native-ctrls",                 true,  OPTION_CHANNEL, "", false, "", 0 },
+    {"native-fdm",                   true,  OPTION_CHANNEL, "", false, "", 0 },
+    {"native-gui",                   true,  OPTION_CHANNEL, "", false, "", 0 },
+    {"opengc",                       true,  OPTION_CHANNEL, "", false, "", 0 },
+    {"garmin",                       true,  OPTION_CHANNEL, "", false, "", 0 },
+    {"nmea",                         true,  OPTION_CHANNEL, "", false, "", 0 },
+    {"generic",                      true,  OPTION_CHANNEL, "", false, "", 0 },
+    {"props",                        true,  OPTION_CHANNEL, "", false, "", 0 },
+    {"telnet",                       true,  OPTION_CHANNEL, "", false, "", 0 },
+    {"pve",                          true,  OPTION_CHANNEL, "", false, "", 0 },
+    {"ray",                          true,  OPTION_CHANNEL, "", false, "", 0 },
+    {"rul",                          true,  OPTION_CHANNEL, "", false, "", 0 },
+    {"joyclient",                    true,  OPTION_CHANNEL, "", false, "", 0 },
+#ifdef FG_NETWORK_OLK
+    {"disable-network-olk",          false, OPTION_BOOL,   "/sim/networking/olk", false, "", 0 },
+    {"enable-network-olk",           false, OPTION_BOOL,   "/sim/networking/olk", true, "", 0 },
+    {"net-hud",                      false, OPTION_FUNC,   "", false, "", fgOptNetHud },
+    {"net-id",                       true,  OPTION_STRING, "sim/networking/call-sign", false, "", 0 },
+#endif
+#ifdef FG_MPLAYER_AS
+    {"callsign",                     true, OPTION_STRING,  "sim/multiplay/callsign", false, "", 0 },
+    {"multiplay",                    true,  OPTION_CHANNEL, "", false, "", 0 },
+#endif
+    {"trace-read",                   true,  OPTION_FUNC,   "", false, "", fgOptTraceRead },
+    {"trace-write",                  true,  OPTION_FUNC,   "", false, "", fgOptTraceWrite },
+    {"log-level",                    true,  OPTION_INT,    "/sim/log-level", false, "", 0 },
+    {"view-offset",                  true,  OPTION_FUNC,   "", false, "", fgOptViewOffset },
+    {"visibility",                   true,  OPTION_FUNC,   "", false, "", fgOptVisibilityMeters },
+    {"visibility-miles",             true,  OPTION_FUNC,   "", false, "", fgOptVisibilityMiles },
+    {"random-wind",                  false, OPTION_FUNC,   "", false, "", fgOptRandomWind },
+    {"wind",                         true,  OPTION_FUNC,   "", false, "", fgOptWind },
+    {"turbulence",                   true,  OPTION_FUNC,   "", false, "", fgOptTurbulence },
+    {"wp",                           true,  OPTION_FUNC,   "", false, "", fgOptWp },
+    {"flight-plan",                  true,  OPTION_FUNC,   "", false, "", fgOptFlightPlan },
+    {"config",                       true,  OPTION_FUNC,   "", false, "", fgOptConfig },
+    {"aircraft",                     true,  OPTION_STRING, "/sim/aircraft", false, "", 0 },
+    {"com1",                         true,  OPTION_DOUBLE, "/radios/comm[0]/frequencies/selected-mhz", false, "", 0 },
+    {"com2",                         true,  OPTION_DOUBLE, "/radios/comm[1]/frequencies/selected-mhz", false, "", 0 },
+    {"nav1",                         true,  OPTION_FUNC,   "", false, "", fgOptNAV1 },
+    {"nav2",                         true,  OPTION_FUNC,   "", false, "", fgOptNAV2 },
+    {"adf",                          true,  OPTION_FUNC,   "", false, "", fgOptADF },
+    {"dme",                          true,  OPTION_FUNC,   "", false, "", fgOptDME },
+    {0}
+};
 
-        // catch extraneous (DOS) line ending character
-        if ( line[line.length() - 1] < 32 ) {
-            line = line.substr( 0, line.length()-1 );
+
+// Parse a single option
+static int
+parse_option (const string& arg)
+{
+    if ( fgOptionMap.size() == 0 ) {
+        size_t i = 0;
+        OptionDesc *pt = &fgOptionArray[ 0 ];
+        while ( pt->option != 0 ) {
+            fgOptionMap[ pt->option ] = i;
+            i += 1;
+            pt += 1;
         }
+    }
 
-       if ( line.find( "--fg-root=" ) == 0 ) {
-           return line.substr( 10 );
+    // General Options
+    if ( (arg == "--help") || (arg == "-h") ) {
+       // help/usage request
+       return(FG_OPTIONS_HELP);
+    } else if ( (arg == "--verbose") || (arg == "-v") ) {
+        // verbose help/usage request
+        return(FG_OPTIONS_VERBOSE_HELP);
+    } else if ( arg.find( "--show-aircraft") == 0) {
+        return(FG_OPTIONS_SHOW_AIRCRAFT);
+    } else if ( arg.find( "--prop:" ) == 0 ) {
+        string assign = arg.substr(7);
+       string::size_type pos = assign.find('=');
+       if ( pos == arg.npos || pos == 0 ) {
+           SG_LOG( SG_GENERAL, SG_ALERT, "Bad property assignment: " << arg );
+           return FG_OPTIONS_ERROR;
        }
-
-       in >> skipcomment;
+       string name = assign.substr(0, pos);
+       string value = assign.substr(pos + 1);
+       fgSetString(name.c_str(), value.c_str());
+       // SG_LOG(SG_GENERAL, SG_INFO, "Setting default value of property "
+       //        << name << " to \"" << value << '"');
+    } else if ( arg.find( "--" ) == 0 ) {
+        size_t pos = arg.find( '=' );
+        string arg_name;
+        if ( pos == string::npos ) {
+            arg_name = arg.substr( 2 );
+        } else {
+            arg_name = arg.substr( 2, pos - 2 );
+        }
+        map<string,size_t>::iterator it = fgOptionMap.find( arg_name );
+        if ( it != fgOptionMap.end() ) {
+            OptionDesc *pt = &fgOptionArray[ it->second ];
+            switch ( pt->type ) {
+                case OPTION_BOOL:
+                    fgSetBool( pt->property, pt->b_param );
+                    break;
+                case OPTION_STRING:
+                    if ( pt->has_param && pos != string::npos ) {
+                        fgSetString( pt->property, arg.substr( pos + 1 ).c_str() );
+                    } else if ( !pt->has_param && pos == string::npos ) {
+                        fgSetString( pt->property, pt->s_param );
+                    } else if ( pt->has_param ) {
+                        SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << arg << "' needs a parameter" );
+                        return FG_OPTIONS_ERROR;
+                    } else {
+                        SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << arg << "' does not have a parameter" );
+                        return FG_OPTIONS_ERROR;
+                    }
+                    break;
+                case OPTION_DOUBLE:
+                    if ( pos != string::npos ) {
+                        fgSetDouble( pt->property, atof( arg.substr( pos + 1 ) ) );
+                    } else {
+                        SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << arg << "' needs a parameter" );
+                        return FG_OPTIONS_ERROR;
+                    }
+                    break;
+                case OPTION_INT:
+                    if ( pos != string::npos ) {
+                        fgSetInt( pt->property, atoi( arg.substr( pos + 1 ) ) );
+                    } else {
+                        SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << arg << "' needs a parameter" );
+                        return FG_OPTIONS_ERROR;
+                    }
+                    break;
+                case OPTION_CHANNEL:
+                    if ( pt->has_param && pos != string::npos ) {
+                        add_channel( pt->option, arg.substr( pos + 1 ) );
+                    } else if ( !pt->has_param && pos == string::npos ) {
+                        add_channel( pt->option, pt->s_param );
+                    } else if ( pt->has_param ) {
+                        SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << arg << "' needs a parameter" );
+                        return FG_OPTIONS_ERROR;
+                    } else {
+                        SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << arg << "' does not have a parameter" );
+                        return FG_OPTIONS_ERROR;
+                    }
+                    break;
+                case OPTION_FUNC:
+                    if ( pt->has_param && pos != string::npos ) {
+                        return pt->func( arg.substr( pos + 1 ).c_str() );
+                    } else if ( !pt->has_param && pos == string::npos ) {
+                        return pt->func( 0 );
+                    } else if ( pt->has_param ) {
+                        SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << arg << "' needs a parameter" );
+                        return FG_OPTIONS_ERROR;
+                    } else {
+                        SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << arg << "' does not have a parameter" );
+                        return FG_OPTIONS_ERROR;
+                    }
+                    break;
+            }
+        } else {
+            SG_LOG( SG_GENERAL, SG_ALERT, "Unknown option '" << arg << "'" );
+            return FG_OPTIONS_ERROR;
+        }
+    } else {
+        SG_LOG( SG_GENERAL, SG_ALERT, "Unknown option '" << arg << "'" );
+        return FG_OPTIONS_ERROR;
     }
 
-    return "";
+    return FG_OPTIONS_OK;
 }
 
 
 // Parse the command line options
 void
-fgParseOptions (int argc, char **argv) {
-    int i = 1;
-    int result;
+fgParseArgs (int argc, char **argv)
+{
+    bool in_options = true;
+    bool verbose = false;
+    bool help = false;
 
     SG_LOG(SG_GENERAL, SG_INFO, "Processing command line arguments");
 
-    while ( i < argc ) {
-       SG_LOG( SG_GENERAL, SG_DEBUG, "argv[" << i << "] = " << argv[i] );
-
-       result = parse_option(argv[i]);
-       if ( (result == FG_OPTIONS_HELP) || (result == FG_OPTIONS_ERROR) ) {
-           fgUsage();
-           exit(-1);
+    for (int i = 1; i < argc; i++) {
+        string arg = argv[i];
+
+       if (in_options && (arg.find('-') == 0)) {
+         if (arg == "--") {
+           in_options = false;
+         } else {
+           int result = parse_option(arg);
+           if ((result == FG_OPTIONS_HELP) || (result == FG_OPTIONS_ERROR))
+              help = true;
+
+            else if (result == FG_OPTIONS_VERBOSE_HELP)
+              verbose = true;
+
+            else if (result == FG_OPTIONS_SHOW_AIRCRAFT) {
+               fgShowAircraft();
+               exit(0);
+            }
+         }
+       } else {
+         in_options = false;
+         SG_LOG(SG_GENERAL, SG_INFO,
+                "Reading command-line property file " << arg);
+         readProperties(arg, globals->get_props());
        }
+    }
 
-       i++;
+    if (help) {
+       fgUsage(verbose);
+       exit(0);
     }
+
+    SG_LOG(SG_GENERAL, SG_INFO, "Finished command line arguments");
 }
 
 
@@ -1053,9 +1526,8 @@ fgParseOptions (const string& path) {
         }
 
        if ( parse_option( line ) == FG_OPTIONS_ERROR ) {
-           SG_LOG( SG_GENERAL, SG_ALERT, 
-                   "Config file parse error: " << path << " '" 
-                   << line << "'" );
+            cerr << endl << "Config file parse error: " << path << " '" 
+                   << line << "'" << endl;
            fgUsage();
            exit(-1);
        }
@@ -1066,177 +1538,191 @@ fgParseOptions (const string& path) {
 
 // Print usage message
 void 
-fgUsage ()
+fgUsage (bool verbose)
 {
-    cout << "Usage: fgfs [ 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 a 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 << "\t--enable-auto-coordination:  enable auto coordination" << endl;
-    cout << "\t--disable-auto-coordination:  disable auto coordination" << endl;
-    cout << "\t--browser-app=/path/to/app:  specify location of your web browser" << endl;
-    cout << "\t--prop:name=value:  set property <name> to <value>" << endl;
-    cout << "\t--config=path:  load additional properties from path" << endl;
-    cout << endl;
+    SGPropertyNode *locale = globals->get_locale();
 
-    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 instrument 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;
+    SGPropertyNode options_root;
 
-    cout << "Aircraft:" <<endl;
-    cout << "\t--aircraft=name:  select a top level <name>-set.xml file which" << endl;
-    cout << "\t\twill automatically pull in the correct flight dynamics model," << endl;
-    cout << "\t\taero specification, external 3d model, instrument panel, sounds," << endl;
-    cout << "\t\tetc." << endl;
-    
     cout << endl;
 
-    cout << "Flight Model:" << endl;
-    cout << "\t--fdm=abcd:  selects the core flight model code." << endl;
-    cout << "\t\tcan be one of jsb, larcsim, magic, null, external, balloon, or ada"
-        << endl;
-    cout << "\t--aero=abcd:  aerodynamics 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;
+    try {
+        fgLoadProps("options.xml", &options_root);
+    } catch (const sg_exception &ex) {
+        cout << "Unable to read the help file." << endl;
+        cout << "Make sure the file options.xml is located in the FlightGear base directory," << endl;
+        cout << "and the location of the base directory is specified by setting $FG_ROOT or" << endl;
+        cout << "by adding --fg-root=path as a program argument." << endl;
+        
+        exit(-1);
+    }
 
-    //(UIUC)
-    cout <<"Aircraft model directory:" << endl;
-    cout <<"\t--aircraft-dir=<path> path is relative to the path of the executable" << endl;
-    cout << endl;
+    SGPropertyNode *options = options_root.getNode("options");
+    if (!options) {
+        SG_LOG( SG_GENERAL, SG_ALERT,
+                "Error reading options.xml: <options> directive not found." );
+        exit(-1);
+    }
 
-    cout << "Initial Position and Orientation:" << endl;
-    cout << "\t--airport-id=ABCD:  specify starting postion by airport id" 
-        << endl;
-    cout << "\t--offset-distance:  specify distance to threshold"
-         << " (NM)" << endl; 
-    cout << "\t--offset-azimuth:  specify heading to threshold (deg) " 
-         << 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 degrees (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" << endl;
-    cout << "\t--mach= initial mach number" << endl;
-    cout << endl;
+    SGPropertyNode *usage = locale->getNode(options->getStringValue("usage"));
+    if (usage) {
+        cout << "Usage: " << usage->getStringValue() << 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;
+    vector<SGPropertyNode_ptr>section = options->getChildren("section");
+    for (unsigned int j = 0; j < section.size(); j++) {
+        string msg = "";
+
+        vector<SGPropertyNode_ptr>option = section[j]->getChildren("option");
+        for (unsigned int k = 0; k < option.size(); k++) {
+
+            SGPropertyNode *name = option[k]->getNode("name");
+            SGPropertyNode *short_name = option[k]->getNode("short");
+            SGPropertyNode *key = option[k]->getNode("key");
+            SGPropertyNode *arg = option[k]->getNode("arg");
+            bool brief = option[k]->getNode("brief");
+
+            if ((brief || verbose) && name) {
+                string tmp = name->getStringValue();
+
+                if (key){
+                    tmp.append(":");
+                    tmp.append(key->getStringValue());
+                }
+                if (arg) {
+                    tmp.append("=");
+                    tmp.append(arg->getStringValue());
+                }
+                if (short_name) {
+                    tmp.append(", -");
+                    tmp.append(short_name->getStringValue());
+                }
+
+                char cstr[96];
+                if (tmp.size() <= 25) {
+                    snprintf(cstr, 96, "   --%-27s", tmp.c_str());
+                } else {
+                    snprintf(cstr, 96, "\n   --%s\n%32c", tmp.c_str(), ' ');
+                }
+
+                // There may be more than one <description> tag assosiated
+                // with one option
+
+                msg += cstr;
+                vector<SGPropertyNode_ptr>desc =
+                                          option[k]->getChildren("description");
+
+                if (desc.size() > 0) {
+                   for ( unsigned int l = 0; l < desc.size(); l++) {
+
+                      // There may be more than one translation line.
+
+                      string t = desc[l]->getStringValue();
+                      SGPropertyNode *n = locale->getNode("strings");
+                      vector<SGPropertyNode_ptr>trans_desc =
+                               n->getChildren(t.substr(8).c_str());
+
+                      for ( unsigned int m = 0; m < trans_desc.size(); m++ ) {
+                         string t_str = trans_desc[m]->getStringValue();
+
+                         if ((m > 0) || ((l > 0) && m == 0)) {
+                            snprintf(cstr, 96, "%32c", ' ');
+                            msg += cstr;
+
+                         }
+
+                         // If the string is too large to fit on the screen,
+                         // then split it up in several pieces.
+
+                         while ( t_str.size() > 47 ) {
+
+                            unsigned int m = t_str.rfind(' ', 47);
+                            msg += t_str.substr(0, m);
+                            snprintf(cstr, 96, "\n%32c", ' ');
+                            msg += cstr;
+
+                            t_str.erase(t_str.begin(), t_str.begin() + m + 1);
+                        }
+                        msg += t_str + '\n';
+                     }
+                  }
+               }
+            }
+        }
 
-    cout << "Scenery Options:" << endl;
-    cout << "\t--tile-radius=n:  specify tile radius, must be 1 - 4" << endl;
-    cout << endl;
+        SGPropertyNode *name =
+                            locale->getNode(section[j]->getStringValue("name"));
 
-    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;
-       
-    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
-    cout << endl;
+        if (!msg.empty() && name) {
+           cout << endl << name->getStringValue() << ":" << endl;
+           cout << msg;
+           msg.erase();
+        }
+    }
 
-    cout << "Network Options:" << endl;
-    cout << "\t--httpd=port:  enable http server on the specified port" << 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
+    if ( !verbose ) {
+        cout << endl;
+        cout << "For a complete list of options use --help --verbose" << endl;
+    }
+}
 
-    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;
+// Show available aircraft types
+void fgShowAircraft(void) {
+   vector<string> aircraft;
+
+   SGPath path( globals->get_fg_root() );
+   path.append("Aircraft");
+
+   ulDirEnt* dire;
+   ulDir *dirp;
+
+   dirp = ulOpenDir(path.c_str());
+   if (dirp == NULL) {
+      cerr << "Unable to open aircraft directory." << endl;
+      exit(-1);
+   }
+
+   while ((dire = ulReadDir(dirp)) != NULL) {
+      char *ptr;
+
+      if ((ptr = strstr(dire->d_name, "-set.xml")) && ptr[8] == '\0' ) {
+          SGPath afile = path;
+          afile.append(dire->d_name);
+
+          *ptr = '\0';
+
+          SGPropertyNode root;
+          try {
+             readProperties(afile.str(), &root);
+          } catch (...) {
+             continue;
+          }
+
+          SGPropertyNode *desc = NULL;
+          SGPropertyNode *node = root.getNode("sim");
+          if (node) {
+             desc = node->getNode("description");
+          }
+
+          char cstr[96];
+          if (strlen(dire->d_name) <= 27)
+             snprintf(cstr, 96, "   %-27s  %s", dire->d_name,
+                      (desc) ? desc->getStringValue() : "" );
+
+          else
+             snprintf(cstr, 96, "   %-27s\n%32c%s", dire->d_name, ' ',
+                      (desc) ? desc->getStringValue() : "" );
+
+          aircraft.push_back(cstr);
+      }
+   }
+
+   sort(aircraft.begin(), aircraft.end());
+   cout << "Available aircraft:" << endl;
+   for ( unsigned int i = 0; i < aircraft.size(); i++ ) {
+       cout << aircraft[i] << endl;
+   }
+
+   aircraft.clear();
+   ulCloseDir(dirp);
 }