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 d4bf83fbb0d6d07e4de84cd83698b5232c4193d0..76608d2e1d57fd62c23f0d17276d000536e3fbe5 100644 (file)
--- a/src/Traffic/TrafficMgr.cxx
+++ b/src/Traffic/TrafficMgr.cxx
@@ -124,13 +124,12 @@ void FGTrafficManager::init()
    */ 
   SGPath path = aircraftDir;
   path.append("Traffic/fgtraffic.xml");
-  readXML(path.str(),*this);
+  if (path.exists())
+    readXML(path.str(),*this);
 
   aircraftDir.append("AI/Aircraft");
-  if (aircraftDir.exists())
+  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(".")  && 
@@ -169,6 +168,9 @@ void FGTrafficManager::init()
 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++;