]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/options.cxx
Erik Hofman:
[flightgear.git] / src / Main / options.cxx
index d640ffe2eb85b6fcadfa9e9dfaa241678a0596a8..6cb98fc5adb464704f089c1220e489e3b0f54893 100644 (file)
 #include <simgear/compiler.h>
 #include <simgear/misc/exception.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 STL_STRING
 
 #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>
@@ -117,9 +115,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
@@ -155,7 +153,7 @@ fgSetDefaults ()
                                // Features
     fgSetBool("/sim/hud/visibility", false);
     fgSetBool("/sim/panel/visibility", true);
-    fgSetBool("/sim/sound", true);
+    fgSetBool("/sim/sound/audible", true);
     fgSetBool("/sim/hud/antialiased", false);
 
                                // Flight Model options
@@ -169,7 +167,6 @@ fgSetDefaults ()
                                // 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);
@@ -179,7 +176,7 @@ fgSetDefaults ()
     fgSetInt("/sim/startup/ysize", 600);
     fgSetInt("/sim/rendering/bits-per-pixel", 16);
     fgSetString("/sim/view-mode", "pilot");
-    fgSetDouble("/sim/view/offset-deg", 0);
+    fgSetDouble("/sim/current-view/heading-offset-deg", 0);
     fgSetDouble("/environment/visibility-m", 20000);
 
                                // HUD options
@@ -189,12 +186,45 @@ 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);
 }
 
 
+static bool
+parse_wind (const string &wind, double * min_hdg, double * max_hdg,
+           double * speed, double * gust)
+{
+  unsigned int 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
 parse_time(const string& time_in) {
@@ -422,7 +452,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);
 
@@ -477,7 +507,7 @@ parse_wp( const string& arg ) {
        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 {
@@ -553,21 +583,29 @@ parse_option (const string& arg)
     } else if ( arg == "--enable-mouse-pointer" ) {
        fgSetString("/sim/startup/mouse-pointer", "enabled");
     } else if ( arg == "--disable-freeze" ) {
-        fgSetBool("/sim/freeze", false);
+        fgSetBool("/sim/freeze/master", false);
     } else if ( arg == "--enable-freeze" ) {
-        fgSetBool("/sim/freeze", true);
+        fgSetBool("/sim/freeze/master", true);
+    } else if ( arg == "--disable-fuel-freeze" ) {
+        fgSetBool("/sim/freeze/fuel", false);
+    } else if ( arg == "--enable-fuel-freeze" ) {
+        fgSetBool("/sim/freeze/fuel", true);
+    } else if ( arg == "--disable-clock-freeze" ) {
+        fgSetBool("/sim/freeze/clock", false);
+    } else if ( arg == "--enable-clock-freeze" ) {
+        fgSetBool("/sim/freeze/clock", 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));
+        fgSetString("/sim/control-mode", arg.substr(10).c_str());
     } 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));
+       fgSetString("/sim/startup/browser-app", arg.substr(14).c_str());
     } else if ( arg == "--disable-hud" ) {
        fgSetBool("/sim/hud/visibility", false);
     } else if ( arg == "--enable-hud" ) {
@@ -577,12 +615,12 @@ parse_option (const string& arg)
     } else if ( arg == "--enable-panel" ) {
        fgSetBool("/sim/panel/visibility", true);
     } else if ( arg == "--disable-sound" ) {
-       fgSetBool("/sim/sound", false);
+       fgSetBool("/sim/sound/audible", false);
     } else if ( arg == "--enable-sound" ) {
-       fgSetBool("/sim/sound", true);
+       fgSetBool("/sim/sound/audible", true);
     } else if ( arg.find( "--airport-id=") == 0 ) {
                                // NB: changed property name!!!
-       fgSetString("/sim/startup/airport-id", arg.substr(13));
+       fgSetString("/sim/startup/airport-id", arg.substr(13).c_str());
     } else if ( arg.find( "--offset-distance=") == 0 ) {
        fgSetDouble("/sim/startup/offset-distance", atof(arg.substr(18)));
     } else if ( arg.find( "--offset-azimuth=") == 0 ) {
@@ -597,49 +635,49 @@ parse_option (const string& arg)
        fgSetString("/sim/startup/airport-id", "");
     } else if ( arg.find( "--altitude=" ) == 0 ) {
        fgSetBool("/sim/startup/onground", false);
-       if ( fgGetString("/sim/startup/units") == "feet" )
+       if ( !strcmp(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" )
+       if ( !strcmp(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" )
+       if ( !strcmp(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" )
+       if ( !strcmp(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" )
+       if ( !strcmp(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" )
+       if ( !strcmp(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" )
+       if ( !strcmp(fgGetString("/sim/startup/units"), "feet") )
          fgSetDouble("/velocities/speed-down-fps", atof(arg.substr(8)));
        else
          fgSetDouble("/velocities/speed-down-fps",
@@ -656,16 +694,21 @@ parse_option (const string& arg)
        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( "--glideslope=" ) == 0 ) {
+       fgSetDouble("/velocities/glideslope", atof(arg.substr(13))
+                                          *SG_DEGREES_TO_RADIANS);
+    }  else if ( arg.find( "--roc=" ) == 0 ) {
+       fgSetDouble("/velocities/vertical-speed-fps", atof(arg.substr(6))/60);
     } 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));
+       fgSetString("/sim/flight-model", arg.substr(6).c_str());
     } else if ( arg.find( "--aero=" ) == 0 ) {
-       fgSetString("/sim/aero", arg.substr(7));
+       fgSetString("/sim/aero", arg.substr(7).c_str());
     } else if ( arg.find( "--aircraft-dir=" ) == 0 ) {
-        fgSetString("/sim/aircraft-dir", arg.substr(15));
+        fgSetString("/sim/aircraft-dir", arg.substr(15).c_str());
     } else if ( arg.find( "--model-hz=" ) == 0 ) {
        fgSetInt("/sim/model-hz", atoi(arg.substr(11)));
     } else if ( arg.find( "--speed=" ) == 0 ) {
@@ -688,14 +731,6 @@ parse_option (const string& arg)
         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" ) {
@@ -764,34 +799,35 @@ parse_option (const string& arg)
        fgSetString("/sim/startup/units", "meters");
     } else if ( arg.find( "--time-offset" ) == 0 ) {
         fgSetInt("/sim/startup/time-offset",
-                          parse_time_offset( (arg.substr(14)) ));
+                 parse_time_offset( (arg.substr(14)) ));
+       fgSetString("/sim/startup/time-offset-type", "system-offset");
     } else if ( arg.find( "--time-match-real") == 0 ) {
-        fgSetString("/sim/startup/time-offset-type",
-                             "system-offset");
+        fgSetString("/sim/startup/time-offset-type", "system-offset");
     } else if ( arg.find( "--time-match-local") == 0 ) {
-        fgSetString("/sim/startup/time-offset-type",
-                             "latitude-offset");
+        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))));
+        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");
+        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))));
+        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( "--atc610x" ) == 0 ) {
+       add_channel( "atc610x", "dummy" );
     } else if ( arg.find( "--atlas=" ) == 0 ) {
        add_channel( "atlas", arg.substr(8) );
     } else if ( arg.find( "--httpd=" ) == 0 ) {
        add_channel( "httpd", arg.substr(8) );
+#ifdef FG_JPEG_SERVER
+    } else if ( arg.find( "--jpg-httpd=" ) == 0 ) {
+       add_channel( "jpg-httpd", arg.substr(12) );
+#endif
     } else if ( arg.find( "--native=" ) == 0 ) {
        add_channel( "native", arg.substr(9) );
     } else if ( arg.find( "--native-ctrls=" ) == 0 ) {
@@ -808,6 +844,8 @@ parse_option (const string& arg)
        add_channel( "nmea", arg.substr(7) );
     } else if ( arg.find( "--props=" ) == 0 ) {
        add_channel( "props", arg.substr(8) );
+    } else if ( arg.find( "--telnet=" ) == 0 ) {
+       add_channel( "telnet", arg.substr(9) );
     } else if ( arg.find( "--pve=" ) == 0 ) {
        add_channel( "pve", arg.substr(6) );
     } else if ( arg.find( "--ray=" ) == 0 ) {
@@ -825,7 +863,7 @@ parse_option (const string& arg)
         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));
+        fgSetString("sim/networking/call-sign", arg.substr(9).c_str());
 #endif
     } else if ( arg.find( "--prop:" ) == 0 ) {
         string assign = arg.substr(7);
@@ -836,12 +874,22 @@ parse_option (const string& arg)
        }
        string name = assign.substr(0, pos);
        string value = assign.substr(pos + 1);
-       fgSetString(name.c_str(), value);
+       fgSetString(name.c_str(), value.c_str());
        // SG_LOG(SG_GENERAL, SG_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("--trace-read=") == 0) {
+        string name = arg.substr(13);
+       SG_LOG(SG_GENERAL, SG_INFO, "Tracing reads for property " << name);
+       fgGetNode(name.c_str(), 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.c_str(), 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" ) {
@@ -853,11 +901,11 @@ parse_option (const string& arg)
        } 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);
+       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
     } else if ( arg.find( "--visibility=" ) == 0 ) {
        fgSetDouble("/environment/visibility-m", atof(arg.substr(13)));
@@ -865,29 +913,39 @@ parse_option (const string& arg)
         double visibility = atof(arg.substr(19)) * 5280.0 * SG_FEET_TO_METER;
        fgSetDouble("/environment/visibility-m", visibility);
     } else if ( arg.find( "--wind=" ) == 0 ) {
+        double min_hdg, max_hdg, speed, gust;
+        if (!parse_wind(arg.substr(7), &min_hdg, &max_hdg, &speed, &gust)) {
+         SG_LOG( SG_GENERAL, SG_ALERT, "bad wind value " << arg.substr(7) );
+         return FG_OPTIONS_ERROR;
+       }
+       fgSetDouble("/environment/wind-from-heading-deg", min_hdg);
+       fgSetDouble("/environment/params/min-wind-from-heading-deg", min_hdg);
+       fgSetDouble("/environment/params/max-wind-from-heading-deg", max_hdg);
+       fgSetDouble("/environment/wind-speed-kt", speed);
+       fgSetDouble("/environment/params/base-wind-speed-kt", speed);
+       fgSetDouble("/environment/params/gust-wind-speed-kt", gust);
+
         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 << '@' << 
+       SG_LOG(SG_GENERAL, SG_INFO, "WIND: " << min_hdg << '@' << 
               speed << " knots" << endl);
-       fgSetDouble("/environment/wind-from-heading-deg", dir);
-       fgSetDouble("/environment/wind-speed-knots", speed);
 
+#ifdef FG_WEATHERCM
         // 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));
+       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
+
     } else if ( arg.find( "--wp=" ) == 0 ) {
        parse_wp( arg.substr( 5 ) );
     } else if ( arg.find( "--flight-plan=") == 0) {
@@ -908,15 +966,9 @@ parse_option (const string& arg)
         apath.append( "Aircraft" );
         apath.append( arg.substr(11) );
         apath.concat( "-set.xml" );
-        try {
-            SGPropertyNode *sim = fgGetNode("/sim");
-            readProperties( apath.str(), sim );
-        } catch (const sg_exception &e) {
-            string message = "Error loading aircraft file: ";
-            message += e.getFormattedMessage();
-            SG_LOG(SG_INPUT, SG_ALERT, message);
-            exit(2);
-        }
+       SG_LOG(SG_INPUT, SG_INFO, "Reading aircraft: " << arg.substr(11)
+           << " from " << apath.str());
+       readProperties( apath.str(), globals->get_props() );
     } else {
        SG_LOG( SG_GENERAL, SG_ALERT, "Unknown option '" << arg << "'" );
        return FG_OPTIONS_ERROR;
@@ -994,23 +1046,35 @@ fgScanForRoot (const string& path)
 
 // 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;
 
     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) ) {
+             fgUsage();
+             exit(-1);
+           }
+         }
+       } else {
+         in_options = false;
+         SG_LOG(SG_GENERAL, SG_INFO,
+                "Reading command-line property file " << arg);
+         readProperties(arg, globals->get_props());
        }
-
-       i++;
     }
+
+    SG_LOG(SG_GENERAL, SG_INFO, "Finished command line arguments");
 }
 
 
@@ -1061,167 +1125,83 @@ fgParseOptions (const string& path) {
 void 
 fgUsage ()
 {
-    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;
-
-    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;
-    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;
-
-    //(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--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;
-
-    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;
-       
-    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;
-
-    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
+    // *** FIXME ***
+    // Began the process of converting output from printf() to
+    // SG_LOG() but this needs to be finished.
+
+    SGPropertyNode options_root;
+    SGPath opath( globals->get_fg_root() );
+    opath.append( "options.xml" );
+
+    try {
+        readProperties(opath.c_str(), &options_root);
+    } catch (const sg_exception &ex) {
+        SG_LOG( SG_GENERAL, SG_ALERT, endl << "Unable to read the help file." );
+        SG_LOG( SG_GENERAL, SG_ALERT, "Make sure the file options.xml is located in the FlightGear base directory." );
+        exit(-1);
+    }
+
+    SGPropertyNode *options = options_root.getNode("options");
+    if (!options) {
+        SG_LOG( SG_GENERAL, SG_ALERT,
+                "Error reading options.xml: <options> directive not found." );
+        exit(-1);
+    }
+
+    SGPropertyNode *usage = options->getNode("usage");
+    if (usage) {
+        SG_LOG( SG_GENERAL, SG_ALERT, "Usage: " << usage->getStringValue() );
+    }
 
-    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;
+    vector<SGPropertyNode_ptr>section = options->getChildren("section");
+    for (unsigned int j = 0; j < section.size(); j++) {
+
+        SGPropertyNode *name = section[j]->getNode("name");
+        if (name) {
+            SG_LOG( SG_GENERAL, SG_ALERT, endl << name->getStringValue()
+                    << ":" );
+        }
+
+        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 *arg = option[k]->getNode("arg");
+
+            if (name) {
+                string str = name->getStringValue();
+                if (short_name) {
+                    str.append(", -");
+                    str.append(short_name->getStringValue());
+                }
+                if (arg) {
+                    str.append("=");
+                    str.append(arg->getStringValue());
+                }
+
+                if (str.size() <= 25) {
+                    fprintf(stderr, "   --%-27s", str.c_str());
+                } else {
+                    fprintf(stderr, "\n   --%s\n%32c", str.c_str(), ' ');
+                }
+
+                str.erase();
+                SGPropertyNode *desc = option[k]->getNode("description");
+                if (desc) {
+                    SG_LOG( SG_GENERAL, SG_ALERT, desc->getStringValue() );
+
+                    for ( int l = 1;
+                          (desc = option[k]->getNode("desc", l, false));
+                          l++ )
+                    {
+                        fprintf(stderr, "%32c%s\n", ' ',
+                                desc->getStringValue());
+                    }
+                } else {
+                    SG_LOG( SG_GENERAL, SG_ALERT, "" );
+                }
+            }
+        }
+    }
 }