fly/flightgear
1
0
Fork 0
Code Activity

- don't abort just because of an unexpected "repeat period"! Complain and

Browse source 
recover instead
- it was apparently planned to run the updated loop only every 1000th
  frame, but the counter isn't reset, so it runs every frame
- use SG_LOG instead of cerr
- don't add redundant slashes in SGPath::append()
This commit is contained in:
mfranz 2007-05-10 14:28:17 +00:00
parent 794f5cc154
commit a4fde6c4d8
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Traffic/SchedFlight.cxx
View file

@ -127,8 +127,9 @@ FGScheduledFlight::FGScheduledFlight(const string& cs,
}
else
{
cerr << "Unknown repeat period" << endl;
exit(1);
repeatPeriod = 365*24*60*60;
SG_LOG( SG_GENERAL, SG_ALERT, "Unknown repeat period in flight plan "
"of flight '" << cs << "': " << rep );
}
// What we still need to do is preprocess the departure and

9
src/Traffic/TrafficMgr.cxx
View file

@ -123,10 +123,10 @@ void FGTrafficManager::init()
* until we have some AI models with traffic in the base package
*/
SGPath path = aircraftDir;
path.append("/Traffic/fgtraffic.xml");
path.append("Traffic/fgtraffic.xml");
readXML(path.str(),*this);
aircraftDir.append("AI/Aircraft/");
aircraftDir.append("AI/Aircraft");
if (aircraftDir.exists())
{
if((d = ulOpenDir(aircraftDir.c_str())) == NULL)
@ -166,7 +166,7 @@ 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() ");
if (runCount < 1000)
@ -174,6 +174,7 @@ void FGTrafficManager::update(double something)
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 +189,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() ");