//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-//#include <Time/event.hxx>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include <simgear/misc/sg_path.hxx>
#include <simgear/debug/logstream.hxx>
#include "ATCdisplay.hxx"
#include "ATCDialog.hxx"
#include "ATCutils.hxx"
+#include "transmissionlist.hxx"
+#include "ground.hxx"
+
/*
// periodic radio station search wrapper
globals->get_ATC_mgr()->Search();
}
*/ //This wouldn't compile - including Time/event.hxx breaks it :-(
+ // Is this still true?? -EMH-
AirportATC::AirportATC() :
lon(0.0),
ground_freq(0.0),
ground_active(false),
set_by_AI(false),
- numAI(0),
- set_by_comm_search(false) {
+ numAI(0)
+ //airport_atc_map.clear();
+{
+ for(int i=0; i<ATC_NUM_TYPES; ++i) {
+ set_by_comm[0][i] = false;
+ set_by_comm[1][i] = false;
+ }
}
FGATCMgr::FGATCMgr() {
comm_ident[0] = "";
comm_ident[1] = "";
- last_comm_ident[0] = "";
- last_comm_ident[1] = "";
- approach_ident = "";
+ //last_comm_ident[0] = "";
+ //last_comm_ident[1] = "";
+ //approach_ident = "";
last_in_range = false;
comm_type[0] = INVALID;
comm_type[1] = INVALID;
comm_atc_ptr[0] = NULL;
comm_atc_ptr[1] = NULL;
+ comm_valid[0] = false;
+ comm_valid[1] = false;
+
+ initDone = false;
}
FGATCMgr::~FGATCMgr() {
}
void FGATCMgr::init() {
- comm_node[0] = fgGetNode("/radios/comm[0]/frequencies/selected-mhz", true);
- comm_node[1] = fgGetNode("/radios/comm[1]/frequencies/selected-mhz", true);
+ //cout << "ATCMgr::init called..." << endl;
+
+ comm_node[0] = fgGetNode("/instrumentation/comm[0]/frequencies/selected-mhz", true);
+ comm_node[1] = fgGetNode("/instrumentation/comm[1]/frequencies/selected-mhz", true);
lon_node = fgGetNode("/position/longitude-deg", true);
lat_node = fgGetNode("/position/latitude-deg", true);
elev_node = fgGetNode("/position/altitude-ft", true);
atc_list_itr = atc_list.begin();
// Search for connected ATC stations once per 0.8 seconds or so
- // global_events.Register( "fgATCSearch()", fgATCSearch,
- // fgEVENT::FG_EVENT_READY, 800);
+ // globals->get_event_mgr()->add( "fgATCSearch()", fgATCSearch,
+ // FGEvent::FG_EVENT_READY, 800);
+ //
// For some reason the above doesn't compile - including Time/event.hxx stops compilation.
+ // Is this still true after the reorganization of the event managar??
+ // -EMH-
// Initialise the frequency search map
current_commlist = new FGCommList;
SGPath p_comm( globals->get_fg_root() );
current_commlist->init( p_comm );
-
+
#ifdef ENABLE_AUDIO_SUPPORT
// Load all available voices.
// For now we'll do one hardwired one
v1 = new FGATCVoice;
- voiceOK = v1->LoadVoice("default");
- voice = true;
+ try {
+ voiceOK = v1->LoadVoice("default");
+ voice = true;
+ } catch ( sg_io_exception & ) {
+ voiceOK = false;
+ voice = false;
+ delete v1;
+ v1 = 0;
+ }
- /* I've loaded the voice even if /sim/sound/audible is false
+ /* I've loaded the voice even if /sim/sound/pause is true
* since I know no way of forcing load of the voice if the user
- * subsequently switches /sim/sound/audible to true. */
+ * subsequently switches /sim/sound/audible to true.
+ * (which is the right thing to do -- CLO) :-) */
#else
voice = false;
#endif
// Initialise the ATC Dialogs
//cout << "Initing Transmissions..." << endl;
- SG_LOG(SG_GENERAL, SG_INFO, " ATC Transmissions");
+ SG_LOG(SG_ATC, SG_INFO, " ATC Transmissions");
current_transmissionlist = new FGTransmissionList;
SGPath p_transmission( globals->get_fg_root() );
p_transmission.append( "ATC/default.transmissions" );
current_transmissionlist->init( p_transmission );
//cout << "Done Transmissions" << endl;
- SG_LOG(SG_GENERAL, SG_INFO, " ATC Dialog System");
+ SG_LOG(SG_ATC, SG_INFO, " ATC Dialog System");
current_atcdialog = new FGATCDialog;
current_atcdialog->Init();
- ATCDialogInit();
-
- // DCL - testing
- //current_atcdialog->add_entry( "EGNX", "Request vectoring for approach", "Request Vectors" );
- //current_atcdialog->add_entry( "EGNX", "Mayday, Mayday", "Declare Emergency" );
- /*
- ATCData test;
- bool ok = current_commlist->FindByCode("KEMT", test, TOWER);
- if(ok) {
- cout << "KEMT tower frequency from test was " << test.freq << endl;
- } else {
- cout << "KEMT tower frequency not found :-(" << endl;
- }
- exit(-1);
- */
+ initDone = true;
+ //cout << "ATCmgr::init done!" << endl;
}
void FGATCMgr::update(double dt) {
+ if(!initDone) {
+ init();
+ SG_LOG(SG_ATC, SG_WARN, "Warning - ATCMgr::update(...) called before ATCMgr::init()");
+ }
+
+ current_atcdialog->Update(dt);
+
//cout << "Entering update..." << endl;
//Traverse the list of active stations.
//Only update one class per update step to avoid the whole ATC system having to calculate between frames.
//Eventually we should only update every so many steps.
- //cout << "In FGATCMgr::update - atc_list.size = " << atc_list.size() << '\n';
+ //cout << "In FGATCMgr::update - atc_list.size = " << atc_list.size() << endl;
if(atc_list.size()) {
if(atc_list_itr == atc_list.end()) {
atc_list_itr = atc_list.begin();
}
//cout << "Updating " << (*atc_list_itr)->get_ident() << ' ' << (*atc_list_itr)->GetType() << '\n';
//cout << "Freq = " << (*atc_list_itr)->get_freq() << '\n';
- (*atc_list_itr)->Update();
+ (*atc_list_itr)->Update(dt * atc_list.size());
//cout << "Done ATC update..." << endl;
++atc_list_itr;
}
+ /*
+ cout << "ATC_LIST: " << atc_list.size() << ' ';
+ for(atc_list_iterator it = atc_list.begin(); it != atc_list.end(); it++) {
+ cout << (*it)->get_ident() << ' ';
+ }
+ cout << '\n';
+ */
+
// Search the tuned frequencies every now and then - this should be done with the event scheduler
- static int i = 0;
+ static int i = 0; // Very ugly - but there should only ever be one instance of FGATCMgr.
+ /*
if(i == 7) {
+ //cout << "About to AreaSearch()" << endl;
AreaSearch();
}
+ */
if(i == 15) {
//cout << "About to search(1)" << endl;
FreqSearch(1);
++i;
//cout << "comm1 type = " << comm_type[0] << '\n';
+ //cout << "Leaving update..." << endl;
}
// Returns frequency in KHz - should I alter this to return in MHz?
-unsigned short int FGATCMgr::GetFrequency(string ident, atc_type tp) {
+unsigned short int FGATCMgr::GetFrequency(const string& ident, const atc_type& tp) {
ATCData test;
bool ok = current_commlist->FindByCode(ident, test, tp);
return(ok ? test.freq : 0);
// Register the fact that the AI system wants to activate an airport
// Might need more sophistication in this in the future - eg registration by aircraft call-sign.
-bool FGATCMgr::AIRegisterAirport(string ident) {
+bool FGATCMgr::AIRegisterAirport(const string& ident) {
+ SG_LOG(SG_ATC, SG_BULK, "AI registered airport " << ident << " with the ATC system");
+ //cout << "AI registered airport " << ident << " with the ATC system" << '\n';
if(airport_atc_map.find(ident) != airport_atc_map.end()) {
airport_atc_map[ident]->set_by_AI = true;
+ airport_atc_map[ident]->numAI++;
return(true);
} else {
- FGAirport ap;
- if(dclFindAirportID(ident, &ap)) {
+ const FGAirport *ap = fgFindAirportID(ident);
+ if (ap) {
+ //cout << "ident = " << ident << '\n';
AirportATC *a = new AirportATC;
// I'm not entirely sure that this AirportATC structure business is actually needed - it just duplicates what we can find out anyway!
- a->lon = ap.longitude;
- a->lat = ap.latitude;
- a->elev = ap.elevation;
+ a->lon = ap->getLongitude();
+ a->lat = ap->getLatitude();
+ a->elev = ap->getElevation();
a->atis_freq = GetFrequency(ident, ATIS);
+ //cout << "ATIS freq = " << a->atis_freq << '\n';
a->atis_active = false;
a->tower_freq = GetFrequency(ident, TOWER);
+ //cout << "Tower freq = " << a->tower_freq << '\n';
a->tower_active = false;
a->ground_freq = GetFrequency(ident, GROUND);
+ //cout << "Ground freq = " << a->ground_freq << '\n';
a->ground_active = false;
// TODO - some airports will have a tower/ground frequency but be inactive overnight.
a->set_by_AI = true;
- a->numAI++;
+ a->numAI = 1;
airport_atc_map[ident] = a;
return(true);
+ } else {
+ SG_LOG(SG_ATC, SG_ALERT, "ERROR - can't find airport " << ident << " in AIRegisterAirport(...)");
}
}
return(false);
// Register the fact that the comm radio is tuned to an airport
-bool FGATCMgr::CommRegisterAirport(string ident) { // Later we'll differentiate between comm 1 and comm2
- // TODO - implement me!
+// Channel is zero based
+bool FGATCMgr::CommRegisterAirport(const string& ident, int chan, const atc_type& tp) {
+ SG_LOG(SG_ATC, SG_BULK, "Comm channel " << chan << " registered airport " << ident);
+ //cout << "Comm channel " << chan << " registered airport " << ident << ' ' << tp << '\n';
+ if(airport_atc_map.find(ident) != airport_atc_map.end()) {
+ //cout << "IN MAP - flagging set by comm..." << endl;
+ airport_atc_map[ident]->set_by_comm[chan][tp] = true;
+ if(tp == ATIS) {
+ airport_atc_map[ident]->atis_active = true;
+ } else if(tp == TOWER) {
+ airport_atc_map[ident]->tower_active = true;
+ } else if(tp == GROUND) {
+ airport_atc_map[ident]->ground_active = true;
+ } else if(tp == APPROACH) {
+ //a->approach_active = true;
+ } // TODO - there *must* be a better way to do this!!!
+ return(true);
+ } else {
+ //cout << "NOT IN MAP - creating new..." << endl;
+ const FGAirport *ap = fgFindAirportID(ident);
+ if (ap) {
+ AirportATC *a = new AirportATC;
+ // I'm not entirely sure that this AirportATC structure business is actually needed - it just duplicates what we can find out anyway!
+ a->lon = ap->getLongitude();
+ a->lat = ap->getLatitude();
+ a->elev = ap->getElevation();
+ a->atis_freq = GetFrequency(ident, ATIS);
+ a->atis_active = false;
+ a->tower_freq = GetFrequency(ident, TOWER);
+ a->tower_active = false;
+ a->ground_freq = GetFrequency(ident, GROUND);
+ a->ground_active = false;
+ if(tp == ATIS) {
+ a->atis_active = true;
+ } else if(tp == TOWER) {
+ a->tower_active = true;
+ } else if(tp == GROUND) {
+ a->ground_active = true;
+ } else if(tp == APPROACH) {
+ //a->approach_active = true;
+ } // TODO - there *must* be a better way to do this!!!
+ // TODO - some airports will have a tower/ground frequency but be inactive overnight.
+ a->set_by_AI = false;
+ a->numAI = 0;
+ a->set_by_comm[chan][tp] = true;
+ airport_atc_map[ident] = a;
+ return(true);
+ }
+ }
return(false);
}
// Remove from list only if not needed by the AI system or the other comm channel
-// TODO - implement me!!
-void FGATCMgr::CommRemoveFromList(const char* id, atc_type tp, int chan) {
- /*AirportATC a;
- if(GetAirportATCDetails((string)id, &a)) {
- if(a.set_by_AI) {
- // Don't remove
- a.set_by_comm_search = false;
- airport_atc_map[(string)id] = a;
+// Note that chan is zero based.
+void FGATCMgr::CommRemoveFromList(const string& id, const atc_type& tp, int chan) {
+ SG_LOG(SG_ATC, SG_BULK, "CommRemoveFromList called for airport " << id << " " << tp << " by channel " << chan);
+ //cout << "CommRemoveFromList called for airport " << id << " " << tp << " by channel " << chan << '\n';
+ if(airport_atc_map.find(id) != airport_atc_map.end()) {
+ AirportATC* a = airport_atc_map[id];
+ //cout << "In CommRemoveFromList, a->ground_freq = " << a->ground_freq << endl;
+ if(a->set_by_AI && tp != ATIS) {
+ // Set by AI, so don't remove simply because user isn't tuned in any more - just stop displaying
+ SG_LOG(SG_ATC, SG_BULK, "In CommRemoveFromList, service was set by AI\n");
+ FGATC* aptr = GetATCPointer(id, tp);
+ switch(chan) {
+ case 0:
+ //cout << "chan 1\n";
+ a->set_by_comm[0][tp] = false;
+ if(!a->set_by_comm[1][tp]) {
+ //cout << "not set by comm2\n";
+ if(aptr != NULL) {
+ //cout << "Got pointer\n";
+ aptr->SetNoDisplay();
+ //cout << "Setting no display...\n";
+ } else {
+ //cout << "Not got pointer\n";
+ }
+ }
+ break;
+ case 1:
+ a->set_by_comm[1][tp] = false;
+ if(!a->set_by_comm[0][tp]) {
+ if(aptr != NULL) {
+ aptr->SetNoDisplay();
+ //cout << "Setting no display...\n";
+ }
+ }
+ break;
+ }
+ //airport_atc_map[id] = a;
return;
} else {
- // remove
+ switch(chan) {
+ case 0:
+ a->set_by_comm[0][tp] = false;
+ // Remove only if not also set by the other comm channel
+ if(!a->set_by_comm[1][tp]) {
+ a->tower_active = false;
+ a->ground_active = false;
+ RemoveFromList(id, tp);
+ }
+ break;
+ case 1:
+ a->set_by_comm[1][tp] = false;
+ if(!a->set_by_comm[0][tp]) {
+ a->tower_active = false;
+ a->ground_active = false;
+ RemoveFromList(id, tp);
+ }
+ break;
+ }
}
- }*/
-
- // Hack - need to implement this properly
- RemoveFromList(id, tp);
+ }
}
// Remove from list - should only be called from above or similar
// This function *will* remove it from the list regardless of who else might want it.
-void FGATCMgr::RemoveFromList(const char* id, atc_type tp) {
- //cout << "Requested type = " << tp << '\n';
- //cout << "id = " << id << '\n';
- atc_list_itr = atc_list.begin();
- while(atc_list_itr != atc_list.end()) {
- //cout << "type = " << (*atc_list_itr)->GetType() << '\n';
- //cout << "Ident = " << (*atc_list_itr)->get_ident() << '\n';
- if( (!strcmp((*atc_list_itr)->get_ident(), id))
- && ((*atc_list_itr)->GetType() == tp) ) {
- //Before removing it stop it transmitting!!
- //cout << "OBLITERATING FROM LIST!!!\n";
- (*atc_list_itr)->SetNoDisplay();
- (*atc_list_itr)->Update();
- delete (*atc_list_itr);
- atc_list_itr = atc_list.erase(atc_list_itr);
- break;
- } // Note that that can upset where we are in the list but that doesn't really matter
- ++atc_list_itr;
+void FGATCMgr::RemoveFromList(const string& id, const atc_type& tp) {
+ //cout << "FGATCMgr::RemoveFromList called..." << endl;
+ //cout << "Requested type = " << tp << endl;
+ //cout << "id = " << id << endl;
+ atc_list_iterator it = atc_list.begin();
+ while(it != atc_list.end()) {
+ //cout << "type = " << (*it)->GetType() << '\n';
+ //cout << "Ident = " << (*it)->get_ident() << '\n';
+ if( ((*it)->get_ident() == id)
+ && ((*it)->GetType() == tp) ) {
+ //Before removing it stop it transmitting!!
+ //cout << "OBLITERATING FROM LIST!!!\n";
+ (*it)->SetNoDisplay();
+ (*it)->Update(0.00833);
+ delete (*it);
+ atc_list.erase(it);
+ atc_list_itr = atc_list.begin(); // Reset the persistent itr incase we've left it off the end.
+ break;
+ }
+ ++it;
}
}
// Find in list - return a currently active ATC pointer given ICAO code and type
// Return NULL if the given service is not in the list
// - *** THE CALLING FUNCTION MUST CHECK FOR THIS ***
-FGATC* FGATCMgr::FindInList(const char* id, atc_type tp) {
- atc_list_itr = atc_list.begin();
- while(atc_list_itr != atc_list.end()) {
- if( (!strcmp((*atc_list_itr)->get_ident(), id))
- && ((*atc_list_itr)->GetType() == tp) ) {
- return(*atc_list_itr);
- } // Note that that can upset where we are in the list but that shouldn't really matter
- ++atc_list_itr;
+FGATC* FGATCMgr::FindInList(const string& id, const atc_type& tp) {
+ //cout << "Entering FindInList for " << id << ' ' << tp << endl;
+ atc_list_iterator it = atc_list.begin();
+ while(it != atc_list.end()) {
+ if( ((*it)->get_ident() == id)
+ && ((*it)->GetType() == tp) ) {
+ return(*it);
+ }
+ ++it;
}
// If we get here it's not in the list
+ //cout << "Couldn't find it in the list though :-(" << endl;
return(NULL);
}
// Returns true if the airport is found in the map
-bool FGATCMgr::GetAirportATCDetails(string icao, AirportATC* a) {
+bool FGATCMgr::GetAirportATCDetails(const string& icao, AirportATC* a) {
if(airport_atc_map.find(icao) != airport_atc_map.end()) {
*a = *airport_atc_map[icao];
return(true);
// Return a pointer to a given sort of ATC at a given airport and activate if necessary
// Returns NULL if service doesn't exist - calling function should check for this.
-FGATC* FGATCMgr::GetATCPointer(string icao, atc_type type) {
+// We really ought to make this private and call it from the CommRegisterAirport / AIRegisterAirport functions
+// - at the moment all these GetATC... functions exposed are just too complicated.
+FGATC* FGATCMgr::GetATCPointer(const string& icao, const atc_type& type) {
if(airport_atc_map.find(icao) == airport_atc_map.end()) {
+ //cout << "Unable to find " << icao << ' ' << type << " in the airport_atc_map" << endl;
return NULL;
}
+ //cout << "In GetATCPointer, found " << icao << ' ' << type << endl;
AirportATC *a = airport_atc_map[icao];
//cout << "a->lon = " << a->lon << '\n';
//cout << "a->elev = " << a->elev << '\n';
//cout << "a->tower_freq = " << a->tower_freq << '\n';
switch(type) {
- case TOWER:
+ case TOWER:
if(a->tower_active) {
// Get the pointer from the list
- return(FindInList(icao.c_str(), type));
+ return(FindInList(icao, type));
} else {
ATCData data;
if(current_commlist->FindByFreq(a->lon, a->lat, a->elev, a->tower_freq, &data, TOWER)) {
atc_list.push_back(t);
a->tower_active = true;
airport_atc_map[icao] = a;
+ //cout << "Initing tower " << icao << " in GetATCPointer()\n";
t->Init();
return(t);
} else {
- cout << "ERROR - tower that should exist in FGATCMgr::GetATCPointer for airport " << icao << " not found\n";
+ SG_LOG(SG_ATC, SG_ALERT, "ERROR - tower that should exist in FGATCMgr::GetATCPointer for airport " << icao << " not found");
}
}
break;
- case APPROACH:
+ case APPROACH:
break;
- case ATIS:
- SG_LOG(SG_GENERAL, SG_ALERT, "ERROR - ATIS station should not be requested from FGATCMgr::GetATCPointer");
+ case ATIS:
+ SG_LOG(SG_ATC, SG_ALERT, "ERROR - ATIS station should not be requested from FGATCMgr::GetATCPointer");
break;
- case GROUND:
+ case GROUND:
+ //cout << "IN CASE GROUND" << endl;
if(a->ground_active) {
// Get the pointer from the list
- return(FindInList(icao.c_str(), type));
+ return(FindInList(icao, type));
} else {
ATCData data;
if(current_commlist->FindByFreq(a->lon, a->lat, a->elev, a->ground_freq, &data, GROUND)) {
g->Init();
return(g);
} else {
- cout << "ERROR - ground control that should exist in FGATCMgr::GetATCPointer for airport " << icao << " not found\n";
+ SG_LOG(SG_ATC, SG_ALERT, "ERROR - ground control that should exist in FGATCMgr::GetATCPointer for airport " << icao << " not found");
}
}
break;
break;
}
- SG_LOG(SG_GENERAL, SG_ALERT, "ERROR IN FGATCMgr - reached end of GetATCPointer");
+ SG_LOG(SG_ATC, SG_ALERT, "ERROR IN FGATCMgr - reached end of GetATCPointer");
+ //cout << "ERROR IN FGATCMgr - reached end of GetATCPointer" << endl;
return(NULL);
}
// TODO - in the future this will get more complex and dole out country/airport
// specific voices, and possible make sure that the same voice doesn't get used
// at different airports in quick succession if a large enough selection are available.
-FGATCVoice* FGATCMgr::GetVoicePointer(atc_type type) {
+FGATCVoice* FGATCMgr::GetVoicePointer(const atc_type& type) {
// TODO - implement me better - maintain a list of loaded voices and other voices!!
if(voice) {
switch(type) {
}
}
-// Display a dialog box with options relevant to the currently tuned ATC service.
-void FGATCMgr::doPopupDialog() {
- ATCDoDialog(comm_type[0]); // FIXME - currently hardwired to comm1
-}
-
// Search for ATC stations by frequency
void FGATCMgr::FreqSearch(int channel) {
int chan = channel - 1; // Convert to zero-based for the arrays
}
}
// At this point we can assume that we need to add the service.
- comm_ident[chan] = (data.ident).c_str();
+ comm_ident[chan] = data.ident;
comm_type[chan] = data.type;
comm_x[chan] = (double)data.x;
comm_y[chan] = (double)data.y;
// This was a switch-case statement but the compiler didn't like the new variable creation with it.
if(comm_type[chan] == ATIS) {
- FGATIS* a = new FGATIS;
- a->SetData(&data);
- comm_atc_ptr[chan] = a;
- a->SetDisplay();
- //a->set_refname((chan) ? "atis2" : "atis1"); // FIXME - that line is limited to 2 channels
- atc_list.push_back(a);
+ CommRegisterAirport(comm_ident[chan], chan, ATIS);
+ FGATC* app = FindInList(comm_ident[chan], ATIS);
+ if(app != NULL) {
+ // The station is already in the ATC list
+ //cout << "In list - flagging SetDisplay..." << endl;
+ comm_atc_ptr[chan] = app;
+ app->SetDisplay();
+ } else {
+ // Generate the station and put in the ATC list
+ //cout << "Not in list - generating..." << endl;
+ FGATIS* a = new FGATIS;
+ a->SetData(&data);
+ comm_atc_ptr[chan] = a;
+ a->SetDisplay();
+ //a->Init();
+ atc_list.push_back(a);
+ }
} else if (comm_type[chan] == TOWER) {
+ //cout << "TOWER TOWER TOWER\n";
+ CommRegisterAirport(comm_ident[chan], chan, TOWER);
+ //cout << "Done (TOWER)" << endl;
FGATC* app = FindInList(comm_ident[chan], TOWER);
if(app != NULL) {
// The station is already in the ATC list
+ SG_LOG(SG_GENERAL, SG_DEBUG, comm_ident[chan] << " is in list - flagging SetDisplay...");
+ //cout << comm_ident[chan] << " is in list - flagging SetDisplay...\n";
+ comm_atc_ptr[chan] = app;
app->SetDisplay();
} else {
// Generate the station and put in the ATC list
+ SG_LOG(SG_GENERAL, SG_DEBUG, comm_ident[chan] << " is not in list - generating...");
+ //cout << comm_ident[chan] << " is not in list - generating...\n";
FGTower* t = new FGTower;
t->SetData(&data);
comm_atc_ptr[chan] = t;
- t->SetDisplay();
+ //cout << "Initing tower in FreqSearch()\n";
t->Init();
+ t->SetDisplay();
atc_list.push_back(t);
}
+ } else if (comm_type[chan] == GROUND) {
+ CommRegisterAirport(comm_ident[chan], chan, GROUND);
+ //cout << "Done (GROUND)" << endl;
+ FGATC* app = FindInList(comm_ident[chan], GROUND);
+ if(app != NULL) {
+ // The station is already in the ATC list
+ comm_atc_ptr[chan] = app;
+ app->SetDisplay();
+ } else {
+ // Generate the station and put in the ATC list
+ FGGround* g = new FGGround;
+ g->SetData(&data);
+ comm_atc_ptr[chan] = g;
+ g->Init();
+ g->SetDisplay();
+ atc_list.push_back(g);
+ }
} else if (comm_type[chan] == APPROACH) {
// We have to be a bit more carefull here since approaches are also searched by area
+ CommRegisterAirport(comm_ident[chan], chan, APPROACH);
+ //cout << "Done (APPROACH)" << endl;
FGATC* app = FindInList(comm_ident[chan], APPROACH);
if(app != NULL) {
// The station is already in the ATC list
// Generate the station and put in the ATC list
FGApproach* a = new FGApproach;
a->SetData(&data);
+ comm_atc_ptr[chan] = a;
+ a->Init();
+ a->SetDisplay();
a->AddPlane("Player");
atc_list.push_back(a);
- comm_atc_ptr[chan] = a;
}
}
} else {
}
}
-
// Search ATC stations by area in order that we appear 'on the radar'
void FGATCMgr::AreaSearch() {
// Search for Approach stations
for(app_itr = approaches.begin(); app_itr != approaches.end(); app_itr++) {
- FGATC* app = FindInList((app_itr->ident).c_str(), app_itr->type);
+ FGATC* app = FindInList(app_itr->ident, app_itr->type);
if(app != NULL) {
// The station is already in the ATC list
+ //cout << "In list adding player\n";
app->AddPlane("Player");
//app->Update();
} else {
// Generate the station and put in the ATC list
FGApproach* a = new FGApproach;
a->SetData(&(*app_itr));
+ //cout << "Adding player\n";
a->AddPlane("Player");
//a->Update();
atc_list.push_back(a);
// remove planes which are out of range
// TODO - I'm not entirely sure that this belongs here.
- atc_list_itr = atc_list.begin();
- while(atc_list_itr != atc_list.end()) {
- if((*atc_list_itr)->GetType() == APPROACH ) {
- int np = (*atc_list_itr)->RemovePlane();
+ atc_list_iterator it = atc_list.begin();
+ while(it != atc_list.end()) {
+ if((*it)->GetType() == APPROACH ) {
+ int np = (*it)->RemovePlane();
// if approach has no planes left remove it from ATC list
if ( np == 0) {
- (*atc_list_itr)->SetNoDisplay();
- (*atc_list_itr)->Update();
- delete (*atc_list_itr);
- atc_list_itr = atc_list.erase(atc_list_itr);
+ //cout << "REMOVING AN APPROACH STATION WITH NO PLANES..." << endl;
+ (*it)->SetNoDisplay();
+ (*it)->Update(0.00833);
+ delete (*it);
+ atc_list.erase(it);
+ atc_list_itr = atc_list.begin(); // Reset the persistent itr incase we've left it off the end.
break; // the other stations will be checked next time
}
}
- ++atc_list_itr;
+ ++it;
}
}
projects / flightgear.git / blobdiff