Added support for managing fov via the property manager so the --fov= option

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

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 3b442d959df8f3012fd2e807caddb35b620b7aaa..01c0dfbf159ca3116fa25053c83d7219b81a54ad 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -27,6 +27,11 @@
 
 #include <simgear/compiler.h>
 
+/* normans fix */
+#if defined(FX) && defined(XMESA)
+bool global_fullscreen = true;
+#endif
+
 #include <math.h>            // rint()
 #include <stdio.h>
 #include <stdlib.h>          // atof(), atoi()
@@ -530,9 +535,9 @@ 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);
+        globals->set_freeze(false);
     } else if ( arg == "--enable-freeze" ) {
-       fgSetBool("/sim/freeze", true);
+        globals->set_freeze(true);
     } else if ( arg == "--disable-anti-alias-hud" ) {
        fgSetBool("/sim/hud/antialiased", false);
     } else if ( arg == "--enable-anti-alias-hud" ) {
@@ -765,6 +770,8 @@ parse_option (const string& arg)
         fgSetString("/sim/hud/frame-stat-type", "tris");
     } else if ( arg == "--hud-culled" ) {
         fgSetString("/sim/hud/frame-stat-type", "culled");
+    } else if ( arg.find( "--atlas=" ) != string::npos ) {
+       parse_channel( "atlas", arg.substr(8) );
     } else if ( arg.find( "--native=" ) != string::npos ) {
        parse_channel( "native", arg.substr(9) );
     } else if ( arg.find( "--garmin=" ) != string::npos ) {
@@ -802,8 +809,8 @@ parse_option (const string& arg)
        string name = assign.substr(0, pos);
        string value = assign.substr(pos + 1);
        fgSetString(name.c_str(), value);
-       FG_LOG(FG_GENERAL, FG_INFO, "Setting default value of property "
-              << name << " to \"" << value << '"');
+       // FG_LOG(FG_GENERAL, FG_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( "--view-offset=" ) != string::npos ) {
@@ -991,7 +998,7 @@ fgParseOptions (const string& path) {
 void 
 fgUsage ()
 {
-    cout << "Usage: fg [ options ... ]" << endl;
+    cout << "Usage: fgfs [ options ... ]" << endl;
     cout << endl;
 
     cout << "General Options:" << endl;