Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / ATC / atc_mgr.cxx

diff --git a/src/ATC/atc_mgr.cxx b/src/ATC/atc_mgr.cxx
index ef17774c2117ca68d73f513943d9b92cd2090319..22e5db5e80d31b37b5f9b6a729dd2ab6f9633ab9 100644 (file)
--- a/src/ATC/atc_mgr.cxx
+++ b/src/ATC/atc_mgr.cxx
@@ -46,8 +46,6 @@ FGATCManager::~FGATCManager() {
 
 void FGATCManager::init() {
     SGSubsystem::init();
-    currentATCDialog = new FGATCDialogNew;
-    currentATCDialog->init();
 
     int leg = 0;
 
@@ -111,7 +109,7 @@ void FGATCManager::init() {
             if (park_index < 0) {
                   SG_LOG( SG_GENERAL, SG_ALERT,
                         "Failed to find parking position " << parking <<
-                        " at airport " << airport << "at " << SG_ORIGIN);
+                        " at airport " << airport << " at " << SG_ORIGIN);
             }
         if (parking.empty() || (park_index < 0)) {
             controller = apt->getDynamics()->getTowerController();
@@ -219,7 +217,7 @@ void FGATCManager::update ( double time ) {
     ai_ac.setSpeed(speed);
     ai_ac.update(time);
     controller = ai_ac.getATCController();
-    currentATCDialog->update(time);
+    FGATCDialogNew::instance()->update(time);
     if (controller) {
        //cerr << "name of previous waypoint : " << fp->getPreviousWaypoint()->getName() << endl;
 
@@ -249,5 +247,7 @@ void FGATCManager::update ( double time ) {
         //cerr << "Adding groundnetWork to the scenegraph::update" << endl;
         prevController = controller;
    }
-   //globals->get_scenery()->get_scene_graph()->addChild(node);
+   for (AtcVecIterator atc = activeStations.begin(); atc != activeStations.end(); atc++) {
+       (*atc)->update(time);
+   }
 }