Remove references to SceneView and CameraView

[flightgear.git] / src / Traffic / TrafficMgr.cxx

diff --git a/src/Traffic/TrafficMgr.cxx b/src/Traffic/TrafficMgr.cxx
index dd42d52f381a56f16bad648f6f37cb7015cda618..76608d2e1d57fd62c23f0d17276d000536e3fbe5 100644 (file)
--- a/src/Traffic/TrafficMgr.cxx
+++ b/src/Traffic/TrafficMgr.cxx
@@ -123,14 +123,13 @@ void FGTrafficManager::init()
    * until we have some AI models with traffic in the base package
    */ 
   SGPath path = aircraftDir;
-  path.append("/Traffic/fgtraffic.xml");
-  readXML(path.str(),*this);
+  path.append("Traffic/fgtraffic.xml");
+  if (path.exists())
+    readXML(path.str(),*this);
 
-  aircraftDir.append("AI/Aircraft/");
-  if (aircraftDir.exists())
+  aircraftDir.append("AI/Aircraft");
+  if ((d = ulOpenDir(aircraftDir.c_str())) != NULL)
     {
-      if((d = ulOpenDir(aircraftDir.c_str())) == NULL)
-        return;
       while((dent = ulReadDir(d)) != NULL) {
        //cerr << "Scanning : " << dent->d_name << endl;
        if (string(dent->d_name) != string(".")  && 
@@ -166,14 +165,18 @@ void FGTrafficManager::init()
   //cerr << "Done initializing schedules" << endl;
 }
 
-void FGTrafficManager::update(double something)
+void FGTrafficManager::update(double /*dt*/)
 {
   //SG_LOG( SG_GENERAL, SG_INFO, "Running TrafficManager::Update() ");
+  // Hack alert: Skip running for the first frames 1000 after 
+  // initialization to allow proper initialization of wheather stuff 
+  // and runway assignments
   if (runCount < 1000)
     {
       runCount++;
       return;
     }
+  //runCount = 0;
   time_t now = time(NULL) + fgGetLong("/sim/time/warp");
   if (scheduledAircraft.size() == 0) {
     //SG_LOG( SG_GENERAL, SG_INFO, "Returned Running TrafficManager::Update() ");
@@ -188,7 +191,7 @@ void FGTrafficManager::update(double something)
     {
       // after proper initialization, we shouldnt get here.
       // But let's make sure
-      cerr << "Failed to update aircraft schedule in traffic manager" << endl;
+      SG_LOG( SG_GENERAL, SG_ALERT, "Failed to update aircraft schedule in traffic manager");
     }
   currAircraft++;
   //SG_LOG( SG_GENERAL, SG_INFO, "Done Running TrafficManager::Update() ");