X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNavaids%2Fnavdb.cxx;h=d5e8005dff089cf73f714f9361228a3a73ae371d;hb=4a79d82ba62fa4e5be759fa0fc4b20220e8da303;hp=60aac0c3ea24724033861f559028feb6968eb39e;hpb=b24dbb3f8b0ebb53321a64be2f86dbb5f244833c;p=flightgear.git diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx index 60aac0c3e..d5e8005df 100644 --- a/src/Navaids/navdb.cxx +++ b/src/Navaids/navdb.cxx @@ -16,10 +16,13 @@ // // 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. // // $Id$ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include @@ -119,11 +122,11 @@ bool fgNavDBInit( FGAirportList *airports, { // Marker Beacon = 7,8,9 mkrlist->add( r ); - } else if ( r->get_type() == 12 ) { - // DME=12 + } else if ( r->get_type() == 12 || r->get_type() == 13) { + // DME with ILS=12; standalone DME=13 string str1( r->get_name() ); - unsigned int loc1= str1.find( "TACAN", 0 ); - unsigned int loc2 = str1.find( "VORTAC", 0 ); + string::size_type loc1= str1.find( "TACAN", 0 ); + string::size_type loc2 = str1.find( "VORTAC", 0 ); if( loc1 != string::npos || loc2 != string::npos ){ //cout << " name = " << r->get_name() ; @@ -146,7 +149,7 @@ bool fgNavDBInit( FGAirportList *airports, path.append( "Navaids/carrier_nav.dat" ); file = path.str(); - SG_LOG( SG_GENERAL, SG_ALERT, "opening file: " << path.str() ); + SG_LOG( SG_GENERAL, SG_INFO, "opening file: " << path.str() ); sg_gzifstream incarrier( path.str() ); @@ -187,9 +190,8 @@ bool fgNavDBInit( FGAirportList *airports, path = globals->get_fg_root(); path.append( "Navaids/TACAN_freq.dat" ); - file = path.str(); - cout << file << endl; - // + SG_LOG( SG_GENERAL, SG_INFO, "opening file: " << path.str() ); + sg_gzifstream inchannel( path.str() ); if ( !inchannel.is_open() ) {