X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCockpit%2Fkr_87.cxx;h=9c06f9a491968290c22d87464032793af1e714c6;hb=8cc7b283d54d10150ad0883e96fd05ce020e7ed8;hp=da6cde50bf44fac723a0a2749bf81e032d1d9762;hpb=44be7da053ceab307651c8f93ac338ce37529a27;p=flightgear.git diff --git a/src/Cockpit/kr_87.cxx b/src/Cockpit/kr_87.cxx index da6cde50b..9c06f9a49 100644 --- a/src/Cockpit/kr_87.cxx +++ b/src/Cockpit/kr_87.cxx @@ -482,33 +482,34 @@ void FGKR_87::search() { double acft_elev = alt_node->getDoubleValue() * SG_FEET_TO_METER; // FIXME: the panel should handle this - FGNav nav; - static string last_ident = ""; //////////////////////////////////////////////////////////////////////// // ADF. //////////////////////////////////////////////////////////////////////// - if ( current_navlist->query( acft_lon, acft_lat, acft_elev, freq, &nav ) ) { + FGNav *nav + = current_navlist->findByFreq(freq, acft_lon, acft_lat, acft_elev); + + if ( nav != NULL ) { char sfreq[128]; snprintf( sfreq, 10, "%.0f", freq ); ident = sfreq; - ident += nav.get_ident(); -// cout << "adf ident = " << ident << endl; + ident += nav->get_ident(); + // cout << "adf ident = " << ident << endl; valid = true; if ( last_ident != ident ) { last_ident = ident; - trans_ident = nav.get_trans_ident(); - stn_lon = nav.get_lon(); - stn_lat = nav.get_lat(); - stn_elev = nav.get_elev(); - range = nav.get_range(); + trans_ident = nav->get_trans_ident(); + stn_lon = nav->get_lon(); + stn_lat = nav->get_lat(); + stn_elev = nav->get_elev(); + range = nav->get_range(); effective_range = kludgeRange(stn_elev, acft_elev, range); - x = nav.get_x(); - y = nav.get_y(); - z = nav.get_z(); + x = nav->get_x(); + y = nav->get_y(); + z = nav->get_z(); if ( globals->get_soundmgr()->exists( "adf-ident" ) ) { globals->get_soundmgr()->remove( "adf-ident" ); @@ -528,7 +529,7 @@ void FGKR_87::search() { // << globals->get_time_params()->get_cur_time() << endl; // cout << "Found an adf station in range" << endl; - // cout << " id = " << nav.get_ident() << endl; + // cout << " id = " << nav->get_ident() << endl; } } else { valid = false;