properly add librt when clock_gettime is used

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

diff --git a/src/ATC/atc_mgr.cxx b/src/ATC/atc_mgr.cxx
index 73130fe631f3bfa15aa510bf527141f7a846bf18..a693e11c98163bb9b576ef436a86dd3bd51b14fc 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;
 
@@ -96,33 +94,38 @@ void FGATCManager::init() {
     ai_ac.setTrafficRef(trafficRef);
     
     string flightPlanName = airport + "-" + airport + ".xml";
-    double cruiseAlt = 100; // Doesn't really matter right now.
-    double courseToDest = 180; // Just use something neutral; this value might affect the runway that is used though...
-    time_t deptime = 0;        // just make sure how flightplan processing is affected by this...
+    //double cruiseAlt = 100; // Doesn't really matter right now.
+    //double courseToDest = 180; // Just use something neutral; this value might affect the runway that is used though...
+    //time_t deptime = 0;        // just make sure how flightplan processing is affected by this...
 
 
     FGAirport *apt = FGAirport::findByIdent(airport); 
-    if (apt && onGround) {
+    if (apt && onGround) {// && !runway.empty()) {
         FGAirportDynamics* dcs = apt->getDynamics();
         int park_index = dcs->getNrOfParkings() - 1;
         //cerr << "found information: " << runway << " " << airport << ": parking = " << parking << endl;
         fp = new FGAIFlightPlan;
         while (park_index >= 0 && dcs->getParkingName(park_index) != parking) park_index--;
             if (park_index < 0) {
-                  SG_LOG( SG_GENERAL, SG_ALERT,
+                  SG_LOG( SG_ATC, SG_ALERT,
                         "Failed to find parking position " << parking <<
-                        " at airport " << airport );
+                        " at airport " << airport << " at " << SG_ORIGIN);
             }
+        // No valid parking location, so either at the runway or at a random location.
         if (parking.empty() || (park_index < 0)) {
-            controller = apt->getDynamics()->getTowerController();
-            int stationFreq = apt->getDynamics()->getTowerFrequency(2);
-            //cerr << "Setting radio frequency to in airfrequency: " << stationFreq << endl;
-            fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0));
-            leg = 3;
-            string fltType = "ga";
-            fp->setRunway(runway);
-            fp->createTakeOff(&ai_ac, false, apt, 0, fltType);
-            ai_ac.setTakeOffStatus(2);
+            if (!runway.empty()) {
+                controller = apt->getDynamics()->getTowerController();
+                int stationFreq = apt->getDynamics()->getTowerFrequency(2);
+                //cerr << "Setting radio frequency to in airfrequency: " << stationFreq << endl;
+                fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0));
+                leg = 3;
+                string fltType = "ga";
+                fp->setRunway(runway);
+                fp->createTakeOff(&ai_ac, false, apt, 0, fltType);
+                ai_ac.setTakeOffStatus(2);
+            } else {
+                // We're on the ground somewhere. Handle this case later.
+            }
         } else {
             controller = apt->getDynamics()->getStartupController();
             int stationFreq = apt->getDynamics()->getGroundFrequency(1);
@@ -219,7 +222,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 +252,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);
+   }
 }