Make sure 'make dist' keeps working.

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

diff --git a/src/Traffic/TrafficMgr.cxx b/src/Traffic/TrafficMgr.cxx
index d4bf83fbb0d6d07e4de84cd83698b5232c4193d0..3a8eb5513cdc5fd180927dbbd8cb7b078d2aea4e 100644 (file)
--- a/src/Traffic/TrafficMgr.cxx
+++ b/src/Traffic/TrafficMgr.cxx
@@ -70,7 +70,7 @@
 
 #include "TrafficMgr.hxx"
 
-SG_USING_STD(sort);
+using std::sort;
  
 /******************************************************************************
  * TrafficManager
@@ -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(".")  && 
@@ -168,13 +167,7 @@ void FGTrafficManager::init()
 
 void FGTrafficManager::update(double /*dt*/)
 {
-  //SG_LOG( SG_GENERAL, SG_INFO, "Running TrafficManager::Update() ");
-  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() ");
@@ -182,7 +175,6 @@ void FGTrafficManager::update(double /*dt*/)
   }
   if(currAircraft == scheduledAircraft.end())
     {
-      //cerr << "resetting schedule " << endl;
       currAircraft = scheduledAircraft.begin();
     }
   if (!((*currAircraft)->update(now)))
@@ -239,12 +231,16 @@ void  FGTrafficManager::startElement (const char * name, const XMLAttributes &at
        path.append(attval);
        readXML(path.str(), *this);
       }
+  elementValueStack.push_back( "" );
   //  cout << "  " << atts.getName(i) << '=' << atts.getValue(i) << endl; 
 }
 
 void  FGTrafficManager::endElement (const char * name) {
   //cout << "End element " << name << endl;
   string element(name);
+  string value = elementValueStack.back();
+  elementValueStack.pop_back();
+
   if (element == string("model"))
     mdl = value;
   else if (element == string("livery"))
@@ -315,8 +311,10 @@ void  FGTrafficManager::endElement (const char * name) {
     }
   else if (element == string("aircraft"))
     {
-      //cerr << "Pushing back aircraft " << registration << endl;
-      scheduledAircraft.push_back(new FGAISchedule(mdl, 
+      int proportion = (int) (fgGetDouble("/sim/traffic-manager/proportion") * 100);
+      int randval = rand() & 100;
+      if (randval < proportion) {
+          scheduledAircraft.push_back(new FGAISchedule(mdl, 
                                               livery, 
                                               registration, 
                                               heavy,
@@ -331,7 +329,8 @@ void  FGTrafficManager::endElement (const char * name) {
      //  while(flights.begin() != flights.end()) {
 //     flights.pop_back();
 //       }
-      for (FGScheduledFlightVecIterator flt = flights.begin(); flt != flights.end(); flt++)
+      }
+  for (FGScheduledFlightVecIterator flt = flights.begin(); flt != flights.end(); flt++)
     {
       delete (*flt);
     }
@@ -347,10 +346,7 @@ void  FGTrafficManager::endElement (const char * name) {
 void  FGTrafficManager::data (const char * s, int len) {
   string token = string(s,len);
   //cout << "Character data " << string(s,len) << endl;
-  if ((token.find(" ") == string::npos && (token.find('\n')) == string::npos))
-      value += token;
-  else
-    value = string("");
+  elementValueStack.back() += token;
 }
 
 void  FGTrafficManager::pi (const char * target, const char * data) {