Fix for an AIFlightPlan initialization problem in the traffic manager.

diff --git a/src/AIModel/AIFlightPlan.cxx b/src/AIModel/AIFlightPlan.cxx
index 27cc98602a46ef19d0e65c1c54f8091b6d4fb5b1..493a6c3ef5741708e15fa0c30452089b389d8a9b 100644 (file)
--- a/src/AIModel/AIFlightPlan.cxx
+++ b/src/AIModel/AIFlightPlan.cxx
@@ -159,7 +159,7 @@ FGAIFlightPlan::FGAIFlightPlan(const std::string& p,
          }
        }
       catch (const sg_exception &e) {
-       SG_LOG(SG_GENERAL, SG_ALERT,
+       SG_LOG(SG_GENERAL, SG_WARN,
               "Error reading AI flight plan: ");
        cerr << "Errno = " << errno << endl;
        if (errno == ENOENT)

diff --git a/src/Traffic/Schedule.cxx b/src/Traffic/Schedule.cxx
index 9ac106e4023e52d298c8d54709c0d5c40c4cc390..3a20c96685d988d3aa5d270a25e4ef14b2cb888f 100644 (file)
--- a/src/Traffic/Schedule.cxx
+++ b/src/Traffic/Schedule.cxx
@@ -376,13 +376,13 @@ bool FGAISchedule::update(time_t now)
                  aircraft->setCompany(airline); //i->getAirline();
                  aircraft->setAcType(acType); //i->getAcType();
                  aircraft->setPath(modelPath.c_str());
-                 aircraft->setFlightPlan(flightPlanName);
+                 //aircraft->setFlightPlan(flightPlanName);
                  aircraft->setLatitude(lat);
                  aircraft->setLongitude(lon);
                  aircraft->setAltitude(i->getCruiseAlt()*100); // convert from FL to feet
                  aircraft->setSpeed(speed);
                  aircraft->setBank(0);
-                 aircraft->SetFlightPlan(new FGAIFlightPlan(modelPath, courseToDest, i->getDepartureTime(), dep, 
+                 aircraft->SetFlightPlan(new FGAIFlightPlan(flightPlanName, courseToDest, i->getDepartureTime(), dep, 
                                                             arr,true, radius, i->getCruiseAlt()*100, lat, lon, speed, flightType, acType, airline));
                  aimgr->attach(aircraft);