fly/flightgear
1
0
Fork 0
Code Activity

Fix a couple of bugs that resulted in ATIS not being heard at airports with AI traffic active

Browse source
This commit is contained in:
daveluff 2003-09-05 13:58:51 +00:00
parent b898c5e4ff
commit d3b7c2ac10
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ATC/ATCmgr.cxx
View file

@ -281,11 +281,12 @@ bool FGATCMgr::CommRegisterAirport(string ident, int chan) {
// Remove from list only if not needed by the AI system or the other comm channel // Remove from list only if not needed by the AI system or the other comm channel
// Note that chan is zero based. // Note that chan is zero based.
void FGATCMgr::CommRemoveFromList(const char* id, atc_type tp, int chan) { void FGATCMgr::CommRemoveFromList(const char* id, atc_type tp, int chan) {
SG_LOG(SG_ATC, SG_BULK, "CommRemoveFromList called for airport " << id << " by channel " << chan); SG_LOG(SG_ATC, SG_BULK, "CommRemoveFromList called for airport " << id << " " << tp << " by channel " << chan);
if(airport_atc_map.find((string)id) != airport_atc_map.end()) { if(airport_atc_map.find((string)id) != airport_atc_map.end()) {
AirportATC* a = airport_atc_map[(string)id]; AirportATC* a = airport_atc_map[(string)id];
//cout << "In CommRemoveFromList, a->ground_freq = " << a->ground_freq << endl; //cout << "In CommRemoveFromList, a->ground_freq = " << a->ground_freq << endl;
if(a->set_by_AI) { if(a->set_by_AI && tp != ATIS) {
SG_LOG(SG_ATC, SG_BULK, "In CommRemoveFromList, service was set by AI\n");
// Don't remove // Don't remove
FGATC* aptr = GetATCPointer((string)id, tp); FGATC* aptr = GetATCPointer((string)id, tp);
switch(chan) { switch(chan) {
@ -533,7 +534,7 @@ void FGATCMgr::FreqSearch(int channel) {
// This was a switch-case statement but the compiler didn't like the new variable creation with it. // This was a switch-case statement but the compiler didn't like the new variable creation with it.
if(comm_type[chan] == ATIS) { if(comm_type[chan] == ATIS) {
CommRegisterAirport(comm_ident[chan], chan); CommRegisterAirport(comm_ident[chan], chan);
FGATC* app = FindInList(comm_ident[chan], TOWER); FGATC* app = FindInList(comm_ident[chan], ATIS);
if(app != NULL) { if(app != NULL) {
// The station is already in the ATC list // The station is already in the ATC list
//cout << "In list - flagging SetDisplay..." << endl; //cout << "In list - flagging SetDisplay..." << endl;