Add David Culp's AI model manager code which is derived from David Luff's AI/ATC...

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

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 53daa5c80716f8ebd4d4ec04b3b65f4215b3dcae..1a9016369068498108a234be56a6819915073de5 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -50,9 +50,6 @@
 // #include <Cockpit/cockpit.hxx>
 // #include <FDM/flight.hxx>
 // #include <FDM/UIUCModel/uiuc_aircraftdir.h>
-#ifdef FG_NETWORK_OLK
-#  include <NetworkOLK/network.h>
-#endif
 
 #include <GUI/gui.h>
 
@@ -181,7 +178,7 @@ fgSetDefaults ()
 #else
     fgSetString("/sim/startup/browser-app", "webrun.bat");
 #endif
-    fgSetString("/sim/logging/priority", "warn");
+    fgSetString("/sim/logging/priority", "alert");
 
                                // Features
     fgSetBool("/sim/hud/antialiased", false);
@@ -223,9 +220,6 @@ fgSetDefaults ()
     fgSetString("/sim/startup/time-offset-type", "system-offset");
     fgSetLong("/sim/time/cur-time-override", 0);
 
-    fgSetBool("/sim/networking/network-olk", false);
-    fgSetString("/sim/networking/call-sign", "Johnny");
-
                                 // Freeze options
     fgSetBool("/sim/freeze/master", false);
     fgSetBool("/sim/freeze/position", false);
@@ -936,16 +930,6 @@ fgOptStartDateGmt( const char *arg )
     return FG_OPTIONS_OK;
 }
 
-#ifdef FG_NETWORK_OLK
-static int
-fgOptNetHud( const char *arg )
-{
-    fgSetBool("/sim/hud/net-display", true);
-    net_hud_display = 1;       // FIXME
-    return FG_OPTIONS_OK;
-}
-#endif
-
 static int
 fgOptTraceRead( const char *arg )
 {
@@ -968,7 +952,7 @@ fgOptLogLevel( const char *arg )
       logbuf::set_log_priority(SG_BULK);
     } else if (priority == "debug") {
       logbuf::set_log_priority(SG_DEBUG);
-    } else if (priority.empty() || priority == "info") { // default
+    } else if (priority == "info") {
       logbuf::set_log_priority(SG_INFO);
     } else if (priority == "warn") {
       logbuf::set_log_priority(SG_WARN);
@@ -977,7 +961,7 @@ fgOptLogLevel( const char *arg )
     } else {
       SG_LOG(SG_GENERAL, SG_WARN, "Unknown logging priority " << priority);
     }
-    SG_LOG(SG_GENERAL, SG_INFO, "Logging priority is " << priority);
+    SG_LOG(SG_GENERAL, SG_DEBUG, "Logging priority is " << priority);
 
     return FG_OPTIONS_OK;
 }
@@ -1174,8 +1158,8 @@ fgOptADF( const char * arg )
 {
     double rot, freq;
     if (parse_colon(arg, &rot, &freq))
-        fgSetDouble("/radios/kr-87/inputs/rotation-deg", rot);
-    fgSetDouble("/radios/kr-87/outputs/selected-khz", freq);
+        fgSetDouble("/instrumentation/adf/rotation-deg", rot);
+    fgSetDouble("/instrumentation/adf/frequencies/selected-khz", freq);
     return FG_OPTIONS_OK;
 }
 
@@ -1367,12 +1351,7 @@ struct OptionDesc {
     {"ray",                          true,  OPTION_CHANNEL, "", false, "", 0 },
     {"rul",                          true,  OPTION_CHANNEL, "", false, "", 0 },
     {"joyclient",                    true,  OPTION_CHANNEL, "", false, "", 0 },
-#ifdef FG_NETWORK_OLK
-    {"disable-network-olk",          false, OPTION_BOOL,   "/sim/networking/olk", false, "", 0 },
-    {"enable-network-olk",           false, OPTION_BOOL,   "/sim/networking/olk", true, "", 0 },
-    {"net-hud",                      false, OPTION_FUNC,   "", false, "", fgOptNetHud },
-    {"net-id",                       true,  OPTION_STRING, "sim/networking/call-sign", false, "", 0 },
-#endif
+    {"jsclient",                     true,  OPTION_CHANNEL, "", false, "", 0 },
 #ifdef FG_MPLAYER_AS
     {"callsign",                     true, OPTION_STRING,  "sim/multiplay/callsign", false, "", 0 },
     {"multiplay",                    true,  OPTION_CHANNEL, "", false, "", 0 },