Interim windows build fix

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

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index a27ecb382a7b255a809633dd3c2df1aa9e4e8cdd..c0a955379b7b70cf72af4a5a9edf43bfa0a47382 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -851,7 +851,7 @@ fgOptRoc( const char *arg )
 static int
 fgOptFgScenery( const char *arg )
 {
-    globals->append_fg_scenery(arg);
+    globals->append_fg_scenery(arg, true);
     return FG_OPTIONS_OK;
 }
 
@@ -1328,6 +1328,7 @@ fgOptVersion( const char *arg )
     }
     cerr << endl;
     cerr << "SimGear version: " << SG_STRINGIZE(SIMGEAR_VERSION) << endl;
+    cerr << "OSG version: " << osgGetVersion() << endl;
     cerr << "PLIB version: " << PLIB_VERSION << endl;
     return FG_OPTIONS_EXIT;
 }
@@ -1362,6 +1363,22 @@ fgOptIgnoreAutosave(const char* arg)
     return FG_OPTIONS_OK;
 }
 
+static int
+fgOptEnableFreeze(const char* arg)
+{
+    fgSetBool("/sim/freeze/master", true);
+    fgSetBool("/sim/freeze/clock", true);
+    return FG_OPTIONS_OK;
+}
+
+static int
+fgOptDisableFreeze(const char* arg)
+{
+    fgSetBool("/sim/freeze/master", false);
+    fgSetBool("/sim/freeze/clock", false);
+    return FG_OPTIONS_OK;
+}
+
 // Set a property for the --prop: option. Syntax: --prop:[<type>:]<name>=<value>
 // <type> can be "double" etc. but also only the first letter "d".
 // Examples:  --prop:alpha=1  --prop:bool:beta=true  --prop:d:gamma=0.123
@@ -1424,7 +1441,7 @@ fgOptLoadTape(const char* arg)
 
     virtual ~ DelayedTapeLoader() {}
 
-    virtual void valueChanged(SGPropertyNode * node) 
+    virtual void valueChanged(SGPropertyNode * node)
     {
       node->removeChangeListener( this );
 
@@ -1511,8 +1528,8 @@ struct OptionDesc {
     {"enable-ai-models",             false, OPTION_BOOL,   "/sim/ai/enabled", true, "", 0 },
     {"disable-ai-traffic",           false, OPTION_BOOL,   "/sim/traffic-manager/enabled", false, "", 0 },
     {"enable-ai-traffic",            false, OPTION_BOOL,   "/sim/traffic-manager/enabled", true,  "", 0 },
-    {"disable-freeze",               false, OPTION_BOOL,   "/sim/freeze/master", false, "", 0 },
-    {"enable-freeze",                false, OPTION_BOOL,   "/sim/freeze/master", true, "", 0 },
+    {"disable-freeze",               false, OPTION_FUNC,   "", false, "", fgOptDisableFreeze },
+    {"enable-freeze",                false, OPTION_FUNC,   "", true, "", fgOptEnableFreeze },
     {"disable-fuel-freeze",          false, OPTION_BOOL,   "/sim/freeze/fuel", false, "", 0 },
     {"enable-fuel-freeze",           false, OPTION_BOOL,   "/sim/freeze/fuel", true, "", 0 },
     {"disable-clock-freeze",         false, OPTION_BOOL,   "/sim/freeze/clock", false, "", 0 },
@@ -2262,7 +2279,7 @@ OptionResult Options::processOptions()
 // now options are process, do supplemental fixup
   const char *envp = ::getenv( "FG_SCENERY" );
   if (envp) {
-    globals->append_fg_scenery(envp);
+    globals->append_fg_scenery(envp, true);
   }
 
 // download dir fix-up
@@ -2496,7 +2513,7 @@ void Options::setupRoot(int argc, char **argv)
 
 #if defined(HAVE_QT)
     if (base_version != required_version) {
-        QtLauncher::initApp(argc, argv);
+        flightgear::initApp(argc, argv);
         if (SetupRootDialog::restoreUserSelectedRoot()) {
             SG_LOG(SG_GENERAL, SG_INFO, "restored user selected fg_root = " << globals->get_fg_root() );
             return;