Additional tweaks to fix the ssg texture (state) problems. Tweaked near

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

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 3701b495e4d14d7f71ee92432e1524d124c2a7ae..286776c7169062b06215f1ad69a985aef722766a 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -201,6 +201,7 @@ fgOPTIONS::fgOPTIONS() :
     }
 
     airport_id = "";  // default airport id
+    net_id = "";
 
     // initialize port config string list
     port_options_list.erase ( port_options_list.begin(), 
@@ -694,19 +695,13 @@ int fgOPTIONS::parse_command_line( int argc, char **argv ) {
 // Parse config file options
 int fgOPTIONS::parse_config_file( const string& path ) {
     fg_gzifstream in( path );
-    if ( !in.is_open() )
+    if ( !in )
        return(FG_OPTIONS_ERROR);
 
     FG_LOG( FG_GENERAL, FG_INFO, "Processing config file: " << path );
 
     in >> skipcomment;
-#ifndef __MWERKS__
-    while ( ! in.eof() ) {
-#else
-    char c = '\0';
-    while ( in.get(c) && c != '\0' ) {
-       in.putback(c);
-#endif
+    while ( !in.eof() ) {
        string line;
 
 #ifdef GETLINE_NEEDS_TERMINATOR