Make sure the ATIS reports surface winds at airports above sea-level

[flightgear.git] / src / ATC / ATCDialog.cxx

diff --git a/src/ATC/ATCDialog.cxx b/src/ATC/ATCDialog.cxx
index d3548985e3b19f6e697d038ef40635689ce70b39..0c96b36cefef1f8114ba26aa53472b72a4b229b7 100644 (file)
--- a/src/ATC/ATCDialog.cxx
+++ b/src/ATC/ATCDialog.cxx
@@ -399,11 +399,12 @@ void FGATCDialog::PopupCallback() {
                } else if(atcptr->GetType() == TOWER) {
                        //cout << "TOWER " << endl;
                        //cout << "ident is " << atcptr->get_ident() << endl;
-                       atcmentry_vec_type atcmlist = (available_dialog[TOWER])[(string)atcptr->get_ident()];
+                       atcmentry_vec_type atcmlist = (available_dialog[TOWER])[atcptr->get_ident()];
                        if(atcmlist.size()) {
                                //cout << "Doing callback...\n";
                                ATCMenuEntry a = atcmlist[atcDialogCommunicationOptions->getValue()];
                                atcptr->SetFreqInUse();
+                               // This is the user's speech getting displayed.
                                globals->get_ATC_display()->RegisterSingleMessage(atcptr->GenText(a.transmission, a.callback_code));
                                _callbackPending = true;
                                _callbackTimer = 0.0;
@@ -459,7 +460,7 @@ void FGATCDialog::FreqDisplay(string ident) {
     FGAirport a;
     if ( dclFindAirportID( ident, &a ) ) {
                comm_list_type stations;
-               int found = current_commlist->FindByPos(a.longitude, a.latitude, a.elevation, 20.0, &stations);
+               int found = current_commlist->FindByPos(a._longitude, a._latitude, a._elevation, 20.0, &stations);
                if(found) {
                        ostringstream ostr;
                        comm_list_iterator itr = stations.begin();