Attached is a reasonably large patch to add a proper ATC

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

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 787e9869ec1d8a1b9b03764ac314171a1cf0786b..d3012aadda4e0dc0c60ec12c03fd9639438b2775 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -70,6 +70,8 @@
 #include <Airports/runways.hxx>
 #include <Airports/simple.hxx>
 #include <ATC/ATCdisplay.hxx>
+#include <ATC/ATCmgr.hxx>
+#include <ATC/atislist.hxx>
 #include <Autopilot/auto_gui.hxx>
 #include <Autopilot/newauto.hxx>
 #include <Cockpit/cockpit.hxx>
@@ -79,7 +81,7 @@
 #include <FDM/ADA.hxx>
 #include <FDM/Balloon.h>
 #include <FDM/External.hxx>
-#include <FDM/JSBSim.hxx>
+#include <FDM/JSBSim/JSBSim.hxx>
 #include <FDM/LaRCsim.hxx>
 #include <FDM/MagicCarpet.hxx>
 #include <FDM/NullFDM.hxx>
@@ -105,7 +107,7 @@
 #ifndef FG_NEW_ENVIRONMENT
 #  include <WeatherCM/FGLocalWeatherDatabase.h>
 #else
-#  include <Environment/environment.hxx>
+#  include <Environment/environment_mgr.hxx>
 #endif
 
 #include "fg_init.hxx"
@@ -866,7 +868,6 @@ bool fgInitSubsystems( void ) {
     // Initialize ATC list management and query systems
     ////////////////////////////////////////////////////////////////////
 
-    //DCL
     SG_LOG(SG_GENERAL, SG_INFO, "  ATIS");
     current_atislist = new FGATISList;
     SGPath p_atis( globals->get_fg_root() );
@@ -877,10 +878,17 @@ bool fgInitSubsystems( void ) {
     // Initialise ATC display system
     ////////////////////////////////////////////////////////////////////
 
-    //DCL
     SG_LOG(SG_GENERAL, SG_INFO, "  ATC Display");
-    current_atcdisplay = new FGATCDisplay;
-    current_atcdisplay->init();   
+    globals->set_ATC_display(new FGATCDisplay);
+    globals->get_ATC_display()->init(); 
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialise the ATC Manager 
+    ////////////////////////////////////////////////////////////////////
+
+    SG_LOG(SG_GENERAL, SG_INFO, "  ATC Manager");
+    globals->set_ATC_mgr(new FGATCMgr);
+    globals->get_ATC_mgr()->init();     
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the built-in commands.