Support Dave Luff's AI plane if /sim/ai-traffic/enabled is set to

true.

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 3e9de016af178ff0880dbe55bb8bd9f5c5d5d02d..aee83504f44ca19bdde5f336191b9ac605140575 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -992,9 +992,11 @@ bool fgInitSubsystems( void ) {
     // Initialise the AI Manager 
     ////////////////////////////////////////////////////////////////////
 
-    SG_LOG(SG_GENERAL, SG_INFO, "  AI Manager");
-    // globals->set_AI_mgr(new FGAIMgr);
-    // globals->get_AI_mgr()->init();     
+    if (fgGetBool("/sim/ai-traffic/enabled")) {
+        SG_LOG(SG_GENERAL, SG_INFO, "  AI Manager");
+        globals->set_AI_mgr(new FGAIMgr);
+        globals->get_AI_mgr()->init();
+    }
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the built-in commands.

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index b8bbb5ccd66da7d11df7feec2b2c700aeb65122d..01e07976439198ae915fb83e670aee8034a91e7a 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -91,7 +91,7 @@ SG_USING_STD(endl);
 
 #include <ATC/ATCmgr.hxx>
 #include <ATC/ATCdisplay.hxx>
-//#include <ATC/AIMgr.hxx>
+#include <ATC/AIMgr.hxx>
 
 
 #include <Autopilot/newauto.hxx>
@@ -1097,7 +1097,8 @@ static void fgMainLoop( void ) {
     globals->get_ATC_mgr()->update(delta_time_sec);
 
     // Run the AI subsystem
-    // globals->get_AI_mgr()->update(delta_time_sec);
+    if (fgGetBool("/sim/ai-traffic/enabled"))
+        globals->get_AI_mgr()->update(delta_time_sec);
 
     // Run flight model