C++ ifying ...

[flightgear.git] / Main / options.cxx

diff --git a/Main/options.cxx b/Main/options.cxx
index ab5be64f3869f655e1a7c42e0a89bf06af3d5472..1cdd667a684f86e53cf3602e577c08343d92c671 100644 (file)
--- a/Main/options.cxx
+++ b/Main/options.cxx
@@ -34,12 +34,15 @@
 #include <string>
 
 #include <Debug/fg_debug.h>
-#include <Flight/flight.h>
+#include <Flight/flight.hxx>
 #include <Include/fg_constants.h>
-#include <Include/fg_zlib.h>
+#include <Misc/fgstream.hxx>
 
 #include "options.hxx"
 
+const int fgOPTIONS::FG_RADIUS_MIN;
+const int fgOPTIONS::FG_RADIUS_MAX;
+
 inline double
 atof( const string& str )
 {
@@ -462,43 +465,27 @@ int fgOPTIONS::parse_command_line( int argc, char **argv ) {
 
 // Parse config file options
 int fgOPTIONS::parse_config_file( const string& path ) {
-    char line[256];
-    fgFile f;
-    int len;
-    string fgpath = path + ".gz";
-
-    // first try "path.gz"
-    if ( (f = fgopen(fgpath.c_str(), "rb")) == NULL ) {
-       // next try "path"
-        if ( (f = fgopen(path.c_str(), "rb")) == NULL ) {
-           return(FG_OPTIONS_ERROR);
-       }
-    }
+    fg_gzifstream in( path );
+    if ( !in )
+       return(FG_OPTIONS_ERROR);
 
     fgPrintf( FG_GENERAL, FG_INFO, "Processing config file: %s\n",
              path.c_str() );
 
-    while ( fggets(f, line, 250) != NULL ) {
-       // strip trailing newline if it exists
-       len = strlen(line);
-       if ( line[len-1] == '\n' ) {
-           line[len-1] = '\0';
-       }
-
-        // strip dos ^M if it exists
-       len = strlen(line);
-       if ( line[len-1] == '\r' ) {
-           line[len-1] = '\0';
-       }
+    in.eat_comments();
+    while ( !in.eof() )
+    {
+       string line;
+       getline( in.stream(), line );
 
-       if (  parse_option( line ) == FG_OPTIONS_ERROR ) {
+       if ( parse_option( line ) == FG_OPTIONS_ERROR ) {
            fgPrintf( FG_GENERAL, FG_EXIT, 
                      "Config file parse error: %s '%s'\n",
-                     path.c_str(), line );
+                     path.c_str(), line.c_str() );
        }
+       in.eat_comments();
     }
 
-    fgclose(f);
     return FG_OPTIONS_OK;
 }
 
@@ -511,8 +498,8 @@ void fgOPTIONS::usage ( void ) {
     printf("General Options:\n");
     printf("\t--help -h:  print usage\n");
     printf("\t--fg-root=path:  specify the root path for all the data files\n");
-    printf("\t--disable-gamemode:  disable full-screen game mode\n");
-    printf("\t--enable-gamemode:  enable full-screen game mode\n");
+    printf("\t--disable-game-mode:  disable full-screen game mode\n");
+    printf("\t--enable-game-mode:  enable full-screen game mode\n");
     printf("\t--disable-splash-screen:  disable splash screen\n");
     printf("\t--enable-splash-screen:  enable splash screen\n");
     printf("\t--disable-intro-music:  disable introduction music\n");
@@ -579,6 +566,31 @@ fgOPTIONS::~fgOPTIONS( void ) {
 
 
 // $Log$
+// Revision 1.26  1998/10/17 01:34:24  curt
+// C++ ifying ...
+//
+// Revision 1.25  1998/09/15 02:09:27  curt
+// Include/fg_callback.hxx
+//   Moved code inline to stop g++ 2.7 from complaining.
+//
+// Simulator/Time/event.[ch]xx
+//   Changed return type of fgEVENT::printStat().  void caused g++ 2.7 to
+//   complain bitterly.
+//
+// Minor bugfix and changes.
+//
+// Simulator/Main/GLUTmain.cxx
+//   Added missing type to idle_state definition - eliminates a warning.
+//
+// Simulator/Main/fg_init.cxx
+//   Changes to airport lookup.
+//
+// Simulator/Main/options.cxx
+//   Uses fg_gzifstream when loading config file.
+//
+// Revision 1.24  1998/09/08 15:04:33  curt
+// Optimizations by Norman Vine.
+//
 // Revision 1.23  1998/08/27 17:02:07  curt
 // Contributions from Bernie Bright <bbright@c031.aone.net.au>
 // - use strings for fg_root and airport_id and added methods to return