- adjusted for no-value constructor for FGPanel

[flightgear.git] / src / Main / options.cxx

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 399ba6207db73e61607fd5cfef008447805d1c98..3714d56275f52da8d01d5242bf2ea77e18147f8c 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -39,7 +39,7 @@ bool global_fullscreen = true;
 
 #include STL_STRING
 
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 
 // #include <Include/general.hxx>
 // #include <Airports/simple.hxx>
@@ -171,7 +171,7 @@ fgSetDefaults ()
     fgSetInt("/sim/startup/ysize", 600);
     fgSetInt("/sim/rendering/bits-per-pixel", 16);
     fgSetString("/sim/view-mode", "pilot");
-    fgSetDouble("/sim/startup/view-offset", 0);
+    fgSetDouble("/sim/view/offset", 0);
     fgSetDouble("/environment/visibility", 20000);
 
                                // HUD options
@@ -463,7 +463,7 @@ parse_wp( const string& arg ) {
     string id, alt_str;
     double alt = 0.0;
 
-    int pos = arg.find( "@" );
+    unsigned int pos = arg.find( "@" );
     if ( pos != string::npos ) {
        id = arg.substr( 0, pos );
        alt_str = arg.substr( pos + 1 );
@@ -492,20 +492,25 @@ parse_wp( const string& arg ) {
 static bool 
 parse_flightplan(const string& arg)
 {
-    fg_gzifstream infile(arg.c_str());
-    if ( !infile.is_open() ) {
+    sg_gzifstream in(arg.c_str());
+    if ( !in.is_open() ) {
        return false;
     }
     while ( true ) {
        string line;
-#ifdef GETLINE_NEEDS_TERMINATOR
-       getline( infile, line, '\n' );
-#elif defined( macintosh )
-       getline( infile, line, '\r' );
+
+#if defined( macintosh )
+        getline( in, line, '\r' );
 #else
-       getline( infile, line );
+       getline( in, line, '\n' );
 #endif
-       if ( infile.eof() ) {
+
+        // catch extraneous (DOS) line ending character
+        if ( line[line.length() - 1] < 32 ) {
+            line = line.substr( 0, line.length()-1 );
+        }
+
+       if ( in.eof() ) {
            break;
        }
        parse_wp(line);
@@ -804,9 +809,9 @@ parse_option (const string& arg)
 #endif
     } else if ( arg.find( "--prop:" ) == 0 ) {
         string assign = arg.substr(7);
-       int pos = assign.find('=');
-       if (pos == arg.npos || pos == 0) {
-           SG_LOG(SG_GENERAL, SG_ALERT, "Bad property assignment: " << arg);
+       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);
@@ -832,7 +837,7 @@ parse_option (const string& arg)
            (FGViewerRPH *)globals->get_viewmgr()->get_view( 0 );
        pilot_view->set_view_offset( default_view_offset );
        pilot_view->set_goal_view_offset( default_view_offset );
-       fgSetDouble("/sim/startup/view-offset", default_view_offset);
+       fgSetDouble("/sim/view/offset", default_view_offset);
     // $$$ end - added VS Renganathan, 14 Oct 2K
     } else if ( arg.find( "--visibility=" ) == 0 ) {
        fgSetDouble("/environment/visibility", atof(arg.substr(13)));
@@ -841,9 +846,9 @@ parse_option (const string& arg)
        fgSetDouble("/environment/visibility", visibility);
     } else if ( arg.find( "--wind=" ) == 0 ) {
         string val = arg.substr(7);
-       int pos = val.find('@');
-       if (pos == string::npos) {
-         SG_LOG(SG_GENERAL, SG_ALERT, "bad wind value " << val);
+       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());
@@ -908,7 +913,7 @@ fgScanForRoot (int argc, char **argv)
 string
 fgScanForRoot (const string& path)
 {
-    fg_gzifstream in( path );
+    sg_gzifstream in( path );
     if ( !in.is_open() )
       return "";
 
@@ -924,14 +929,17 @@ fgScanForRoot (const string& path)
 #endif
        string line;
 
-#ifdef GETLINE_NEEDS_TERMINATOR
-        getline( in, line, '\n' );
-#elif defined( macintosh )
-       getline( in, line, '\r' );
+#if defined( macintosh )
+        getline( in, line, '\r' );
 #else
-        getline( in, line );
+       getline( in, line, '\n' );
 #endif
 
+        // catch extraneous (DOS) line ending character
+        if ( line[line.length() - 1] < 32 ) {
+            line = line.substr( 0, line.length()-1 );
+        }
+
        if ( line.find( "--fg-root=" ) == 0 ) {
            return line.substr( 10 );
        }
@@ -968,9 +976,10 @@ fgParseOptions (int argc, char **argv) {
 // Parse config file options
 void
 fgParseOptions (const string& path) {
-    fg_gzifstream in( path );
-    if ( !in.is_open() )
-      return;
+    sg_gzifstream in( path );
+    if ( !in.is_open() ) {
+        return;
+    }
 
     SG_LOG( SG_GENERAL, SG_INFO, "Processing config file: " << path );
 
@@ -984,14 +993,17 @@ fgParseOptions (const string& path) {
 #endif
        string line;
 
-#ifdef GETLINE_NEEDS_TERMINATOR
-        getline( in, line, '\n' );
-#elif defined( macintosh )
-       getline( in, line, '\r' );
+#if defined( macintosh )
+        getline( in, line, '\r' );
 #else
-        getline( in, line );
+       getline( in, line, '\n' );
 #endif
 
+        // catch extraneous (DOS) line ending character
+        if ( line[line.length() - 1] < 32 ) {
+            line = line.substr( 0, line.length()-1 );
+        }
+
        if ( parse_option( line ) == FG_OPTIONS_ERROR ) {
            SG_LOG( SG_GENERAL, SG_ALERT, 
                    "Config file parse error: " << path << " '" 
@@ -1033,7 +1045,7 @@ fgUsage ()
     cout << "\t--control=mode:  primary control mode " 
         << "(joystick, keyboard, mouse)" << endl;
     cout << "\t--prop:name=value:  set property <name> to <value>" << endl;
-    cout << "\t--file=path:  load additional properties from path" << endl;
+    cout << "\t--config=path:  load additional properties from path" << endl;
     cout << endl;
 
     cout << "Features:" << endl;