fly/flightgear
1
0
Fork 0
Code Activity

Make sure not to disable the entire ATC system when handling special cases.

Browse source
This commit is contained in:
Durk Talsma 2011-12-04 17:31:02 +01:00
parent ded106fe31
commit fcfb905ef1
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/ATC/atc_mgr.cxx
View file

@ -100,7 +100,7 @@ void FGATCManager::init() {
FGAirport *apt = FGAirport::findByIdent(airport); FGAirport *apt = FGAirport::findByIdent(airport);
if (apt && onGround && !runway.empty()) { if (apt && onGround) {// && !runway.empty()) {
FGAirportDynamics* dcs = apt->getDynamics(); FGAirportDynamics* dcs = apt->getDynamics();
int park_index = dcs->getNrOfParkings() - 1; int park_index = dcs->getNrOfParkings() - 1;
//cerr << "found information: " << runway << " " << airport << ": parking = " << parking << endl; //cerr << "found information: " << runway << " " << airport << ": parking = " << parking << endl;
@ -111,16 +111,21 @@ void FGATCManager::init() {
"Failed to find parking position " << parking << "Failed to find parking position " << parking <<
" at airport " << airport << " at " << SG_ORIGIN); " at airport " << airport << " at " << SG_ORIGIN);
} }
// No valid parking location, so either at the runway or at a random location.
if (parking.empty() || (park_index < 0)) { if (parking.empty() || (park_index < 0)) {
controller = apt->getDynamics()->getTowerController(); if (!runway.empty()) {
int stationFreq = apt->getDynamics()->getTowerFrequency(2); controller = apt->getDynamics()->getTowerController();
//cerr << "Setting radio frequency to in airfrequency: " << stationFreq << endl; int stationFreq = apt->getDynamics()->getTowerFrequency(2);
fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0)); //cerr << "Setting radio frequency to in airfrequency: " << stationFreq << endl;
leg = 3; fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0));
string fltType = "ga"; leg = 3;
fp->setRunway(runway); string fltType = "ga";
fp->createTakeOff(&ai_ac, false, apt, 0, fltType); fp->setRunway(runway);
ai_ac.setTakeOffStatus(2); fp->createTakeOff(&ai_ac, false, apt, 0, fltType);
ai_ac.setTakeOffStatus(2);
} else {
// We're on the ground somewhere. Handle this case later.
}
} else { } else {
controller = apt->getDynamics()->getStartupController(); controller = apt->getDynamics()->getStartupController();
int stationFreq = apt->getDynamics()->getGroundFrequency(1); int stationFreq = apt->getDynamics()->getGroundFrequency(1);