traffic: more pass by reference + member init

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

diff --git a/src/ATC/atc_mgr.cxx b/src/ATC/atc_mgr.cxx
index c4372173934b045cf55d3bd36d82dfc292997f8e..67d53c9fc05fdcd72336badf2db3f548ca6e462c 100644 (file)
--- a/src/ATC/atc_mgr.cxx
+++ b/src/ATC/atc_mgr.cxx
@@ -48,6 +48,8 @@ void FGATCManager::init() {
 
     int leg = 0;
 
+    trans_num = globals->get_props()->getNode("/sim/atc/transmission-num", true);
+
     // find a reasonable controller for our user's aircraft..
     // Let's start by working out the following three scenarios: 
     // Starting on ground at a parking position
@@ -74,7 +76,7 @@ void FGATCManager::init() {
     ai_ac.setLongitude( longitude );
     ai_ac.setLatitude ( latitude  );
     ai_ac.setAltitude ( altitude  );
-    ai_ac.setPerformance("jet_transport");
+    ai_ac.setPerformance("", "jet_transport");
 
     // NEXT UP: Create a traffic Schedule and fill that with appropriate information. This we can use to flight planning.
     // Note that these are currently only defaults. 
@@ -101,12 +103,11 @@ void FGATCManager::init() {
     FGAirport *apt = FGAirport::findByIdent(airport); 
     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--;
+        ParkingAssignment pk(dcs->getParkingByName(parking));
+      
         // No valid parking location, so either at the runway or at a random location.
-        if (parking.empty() || (park_index < 0)) {
+        if (!pk.isValid()) {
             if (!runway.empty()) {
                 controller = apt->getDynamics()->getTowerController();
                 int stationFreq = apt->getDynamics()->getTowerFrequency(2);
@@ -134,12 +135,11 @@ void FGATCManager::init() {
             leg = 1;
             //double, lat, lon, head; // Unused variables;
             //int getId = apt->getDynamics()->getParking(gateId, &lat, &lon, &head);
-            FGParking* parking = dcs->getParking(park_index);
-            aircraftRadius = parking->getRadius();
-            string fltType = parking->getType(); // gate / ramp, ga, etc etc. 
+            aircraftRadius = pk.parking()->getRadius();
+            string fltType = pk.parking()->getType(); // gate / ramp, ga, etc etc.
             string aircraftType; // Unused.
             string airline;      // Currently used for gate selection, but a fallback mechanism will apply when not specified.
-            fp->setGate(park_index);
+            fp->setGate(pk);
             if (!(fp->createPushBack(&ai_ac,
                                false, 
                                apt, 
@@ -261,8 +261,7 @@ void FGATCManager::update ( double time ) {
         //string airport = fgGetString("/sim/presets/airport-id");
         //FGAirport *apt = FGAirport::findByIdent(airport); 
         // AT this stage we should update the flightplan, so that waypoint incrementing is conducted as well as leg loading. 
-       static SGPropertyNode_ptr trans_num = globals->get_props()->getNode("/sim/atc/transmission-num", true);
-            int n = trans_num->getIntValue();
+        int n = trans_num->getIntValue();
         if (n == 1) {
             //cerr << "Toggling ground network visibility " << networkVisible << endl;
             networkVisible = !networkVisible;