#include "TrafficMgr.hxx"
-SG_USING_STD(sort);
+using std::sort;
/******************************************************************************
* TrafficManager
*/
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(".") &&
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() ");
}
if(currAircraft == scheduledAircraft.end())
{
- //cerr << "resetting schedule " << endl;
currAircraft = scheduledAircraft.begin();
}
if (!((*currAircraft)->update(now)))
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"))
}
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,
// 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);
}
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) {