fly/flightgear
1
0
Fork 0
Code Activity

Bugfix: fix the on-runway crash, as reported by several people on the forum and mailing list.

Browse source
This commit is contained in:
Durk Talsma 2011-07-27 11:01:37 +02:00
parent 987a0fd1df
commit 0215d66957
2 changed files with 56 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/ATC/atc_mgr.cxx
View file

@ -99,11 +99,10 @@ void FGATCManager::init() {
FGAirport *apt = FGAirport::findByIdent(airport); FGAirport *apt = FGAirport::findByIdent(airport);
if (apt) { if (apt && onGround) {
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;
if (onGround) {
fp = new FGAIFlightPlan; fp = new FGAIFlightPlan;
while (park_index >= 0 && dcs->getParkingName(park_index) != parking) park_index--; while (park_index >= 0 && dcs->getParkingName(park_index) != parking) park_index--;
if (park_index < 0) { if (park_index < 0) {
@ -114,7 +113,7 @@ void FGATCManager::init() {
if (parking.empty() || (park_index < 0)) { if (parking.empty() || (park_index < 0)) {
controller = apt->getDynamics()->getTowerController(); controller = apt->getDynamics()->getTowerController();
int stationFreq = apt->getDynamics()->getTowerFrequency(2); int stationFreq = apt->getDynamics()->getTowerFrequency(2);
cerr << "Setting radio frequency to in airfrequency: " << stationFreq << endl; //cerr << "Setting radio frequency to in airfrequency: " << stationFreq << endl;
fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0)); fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0));
leg = 4; leg = 4;
string fltType = "ga"; string fltType = "ga";
@ -123,7 +122,7 @@ void FGATCManager::init() {
} else { } else {
controller = apt->getDynamics()->getStartupController(); controller = apt->getDynamics()->getStartupController();
int stationFreq = apt->getDynamics()->getGroundFrequency(2); int stationFreq = apt->getDynamics()->getGroundFrequency(2);
cerr << "Setting radio frequency to : " << stationFreq << endl; //cerr << "Setting radio frequency to : " << stationFreq << endl;
fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0)); fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0));
leg = 2; leg = 2;
//double, lat, lon, head; // Unused variables; //double, lat, lon, head; // Unused variables;
@ -144,14 +143,12 @@ void FGATCManager::init() {
aircraftType, aircraftType,
airline); airline);
} }
}
} else { } else {
controller = 0; controller = 0;
} }
// Create an initial flightplan and assign it to the ai_ac. We won't use this flightplan, but it is necessary to // Create an initial flightplan and assign it to the ai_ac. We won't use this flightplan, but it is necessary to
// keep the ATC code happy. // keep the ATC code happy.
if (fp) { if (fp) {
fp->restart(); fp->restart();
fp->setLeg(leg); fp->setLeg(leg);
@ -183,19 +180,19 @@ void FGATCManager::update ( double time ) {
FGAIFlightPlan *fp = ai_ac.GetFlightPlan(); FGAIFlightPlan *fp = ai_ac.GetFlightPlan();
/* test code : find out how the routing develops */ /* test code : find out how the routing develops */
if (fp) { //if (fp) {
int size = fp->getNrOfWayPoints(); // int size = fp->getNrOfWayPoints();
//cerr << "Setting pos" << pos << " "; // //cerr << "Setting pos" << pos << " ";
//cerr << "setting intentions " ; // //cerr << "setting intentions " ;
for (int i = 0; i < size; i++) { // for (int i = 0; i < size; i++) {
int val = fp->getRouteIndex(i); // int val = fp->getRouteIndex(i);
//cerr << val << " "; // cerr << val << " ";
//if ((val) && (val != pos)) { //if ((val) && (val != pos)) {
//intentions.push_back(val); //intentions.push_back(val);
//cerr << "[done ] " << endl; //cerr << "[done ] " << endl;
//} //}
} // }
} //}
//cerr << "[done ] " << endl; //cerr << "[done ] " << endl;
double longitude = fgGetDouble("/position/longitude-deg"); double longitude = fgGetDouble("/position/longitude-deg");
double latitude = fgGetDouble("/position/latitude-deg"); double latitude = fgGetDouble("/position/latitude-deg");
@ -207,8 +204,8 @@ void FGATCManager::update ( double time ) {
ai_ac.setAltitude(altitude); ai_ac.setAltitude(altitude);
ai_ac.setHeading(heading); ai_ac.setHeading(heading);
ai_ac.setSpeed(speed); ai_ac.setSpeed(speed);
controller = ai_ac.getATCController();
ai_ac.update(time); ai_ac.update(time);
controller = ai_ac.getATCController();
currentATCDialog->update(time); currentATCDialog->update(time);
if (controller) { if (controller) {
@ -226,7 +223,7 @@ void FGATCManager::update ( double time ) {
static SGPropertyNode_ptr trans_num = globals->get_props()->getNode("/sim/atc/transmission-num", true); static SGPropertyNode_ptr trans_num = globals->get_props()->getNode("/sim/atc/transmission-num", true);
int n = trans_num->getIntValue(); int n = trans_num->getIntValue();
if (n == 1) { if (n == 1) {
cerr << "Toggling ground network visibility " << networkVisible << endl; //cerr << "Toggling ground network visibility " << networkVisible << endl;
networkVisible = !networkVisible; networkVisible = !networkVisible;
trans_num->setIntValue(-1); trans_num->setIntValue(-1);
} }

5
src/ATC/trafficcontrol.cxx
View file

@ -850,6 +850,7 @@ void FGTowerController::signOff(int id)
"AI error: Aircraft without traffic record is signing off from tower"); "AI error: Aircraft without traffic record is signing off from tower");
} else { } else {
i = activeTraffic.erase(i); i = activeTraffic.erase(i);
//cerr << "Signing off from tower controller" << endl;
} }
} }
@ -1051,7 +1052,7 @@ bool FGStartupController::checkTransmissionState(int st, time_t now, time_t star
if (n == 0) { if (n == 0) {
trans_num->setIntValue(-1); trans_num->setIntValue(-1);
// PopupCallback(n); // PopupCallback(n);
cerr << "Selected transmission message " << n << endl; //cerr << "Selected transmission message " << n << endl;
FGATCManager *atc = (FGATCManager*) globals->get_subsystem("atc"); FGATCManager *atc = (FGATCManager*) globals->get_subsystem("atc");
atc->getATCDialog()->removeEntry(1); atc->getATCDialog()->removeEntry(1);
} else { } else {
@ -1263,7 +1264,7 @@ void FGStartupController::render(bool visible)
//->addChild( obj_trans ); //->addChild( obj_trans );
group->addChild( obj_trans ); group->addChild( obj_trans );
} else { } else {
cerr << "BIG FAT WARNING: k is here : " << pos << endl; //cerr << "BIG FAT WARNING: k is here : " << pos << endl;
} }
} }
//dx += 0.1; //dx += 0.1;