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 b367eeff04bf5b000a4b9dadcaa8ca04afc51548..a693e11c98163bb9b576ef436a86dd3bd51b14fc 100644 (file)
--- a/src/ATC/atc_mgr.cxx
+++ b/src/ATC/atc_mgr.cxx
@@ -37,6 +37,7 @@ FGATCManager::FGATCManager() {
     controller = 0;
     prevController = 0;
     networkVisible = false;
+    initSucceeded  = false;
 }
 
 FGATCManager::~FGATCManager() {
@@ -45,8 +46,6 @@ FGATCManager::~FGATCManager() {
 
 void FGATCManager::init() {
     SGSubsystem::init();
-    currentATCDialog = new FGATCDialogNew;
-    currentATCDialog->init();
 
     int leg = 0;
 
@@ -95,32 +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);
+            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);
@@ -135,7 +140,7 @@ void FGATCManager::init() {
             string aircraftType; // Unused.
             string airline;      // Currently used for gate selection, but a fallback mechanism will apply when not specified.
             fp->setGate(park_index);
-            fp->createPushBack(&ai_ac,
+            if (!(fp->createPushBack(&ai_ac,
                                false, 
                                apt, 
                                latitude,
@@ -143,7 +148,10 @@ void FGATCManager::init() {
                                aircraftRadius,
                                fltType,
                                aircraftType,
-                               airline);
+                               airline))) {
+                controller = 0;
+                return;
+            }
 
         }
         fp->getLastWaypoint()->setName( fp->getLastWaypoint()->getName() + string("legend")); 
@@ -169,6 +177,7 @@ void FGATCManager::init() {
    //cerr << "Adding groundnetWork to the scenegraph::init" << endl;
    //globals->get_scenery()->get_scene_graph()->addChild(node);
    }
+   initSucceeded = true;
 }
 
 void FGATCManager::addController(FGATCController *controller) {
@@ -190,16 +199,16 @@ void FGATCManager::update ( double time ) {
     //    //cerr << "setting intentions " ;
         for (int i = 0; i < size; i++) {
     //        int val = fp->getRouteIndex(i);
-            cerr << fp->getWayPoint(i)->getName() << " ";
+            //cerr << fp->getWayPoint(i)->getName() << " ";
             //if ((val) && (val != pos)) {
                 //intentions.push_back(val);
                 //cerr << "[done ] " << endl;
             //}
         }
     }
-    cerr << "[done ] " << endl;
+    //cerr << "[done ] " << endl;
     if (fp) {
-        cerr << "Currently at leg : " << fp->getLeg() << endl;
+        //cerr << "Currently at leg : " << fp->getLeg() << endl;
     }
     double longitude = fgGetDouble("/position/longitude-deg");
     double latitude  = fgGetDouble("/position/latitude-deg");
@@ -213,12 +222,12 @@ 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;
+       //cerr << "name of previous waypoint : " << fp->getPreviousWaypoint()->getName() << endl;
 
         //cerr << "Running FGATCManager::update()" << endl;
-        cerr << "Currently under control of " << controller->getName() << endl;
+        //cerr << "Currently under control of " << controller->getName() << endl;
         controller->updateAircraftInformation(ai_ac.getID(),
                                               latitude,
                                               longitude,
@@ -243,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);
+   }
 }