ignore resets for now because every z/Z key press would trigger a call to NOAA. We...

[flightgear.git] / src / Instrumentation / dme.cxx

diff --git a/src/Instrumentation/dme.cxx b/src/Instrumentation/dme.cxx
index 089ec4d53ecdc00f2664453b201a9829af88e3b4..2bd93b3e46480664abbfda4830a23c4f396573e1 100644 (file)
--- a/src/Instrumentation/dme.cxx
+++ b/src/Instrumentation/dme.cxx
@@ -30,6 +30,8 @@ adjust_range (double transmitter_elevation_ft, double aircraft_altitude_ft,
     double range_nm = 1.23 * sqrt(delta_elevation_ft);
     if (range_nm > max_range_nm)
         range_nm = max_range_nm;
+    else if (range_nm < 20.0)
+        range_nm = 20.0;
     double rand = sg_random();
     return range_nm + (range_nm * rand * rand);
 }
@@ -151,7 +153,7 @@ DME::search (double frequency_mhz, double longitude_rad,
                                               longitude_rad,
                                               latitude_rad,
                                               altitude_m);
-    if (ils != 0 && ils->get_has_dme()) {
+    if (ils !=0 && ils->get_has_dme()) {
         _transmitter_valid = true;
         _transmitter = Point3D(ils->get_dme_x(),
                                ils->get_dme_y(),
@@ -166,7 +168,6 @@ DME::search (double frequency_mhz, double longitude_rad,
                                               longitude_rad,
                                               latitude_rad,
                                               altitude_m);
-    if (nav != 0)
     if (nav != 0 && nav->get_has_dme()) {
         _transmitter_valid = true;
         _transmitter = Point3D(nav->get_x(),