Moved random ground cover object management code (userdata.[ch]xx) over

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

diff --git a/src/Instrumentation/dme.cxx b/src/Instrumentation/dme.cxx
index 3b74e5e8acd530f2b64a50ed99d010d43d3cce29..c4a4fd5879b117a09db798fb464a6cd65fad48c5 100644 (file)
--- a/src/Instrumentation/dme.cxx
+++ b/src/Instrumentation/dme.cxx
@@ -152,17 +152,13 @@ DME::search (double frequency_mhz, double longitude_rad,
                                               latitude_rad,
                                               altitude_m);
     if (ils !=0 && ils->get_has_dme()) {
-            _transmitter_valid = true;
-            _transmitter = Point3D(ils->get_dme_x(),
-                                   ils->get_dme_y(),
-                                   ils->get_dme_z());
-            _transmitter_elevation_ft = ils->get_gselev() * SG_METER_TO_FEET;
-            _transmitter_range_nm = 50; // arbitrary
-            return;
-        } else {
-           _transmitter_valid = false;
-           return;
-        }
+        _transmitter_valid = true;
+        _transmitter = Point3D(ils->get_dme_x(),
+                               ils->get_dme_y(),
+                               ils->get_dme_z());
+        _transmitter_elevation_ft = ils->get_gselev() * SG_METER_TO_FEET;
+        _transmitter_range_nm = 50; // arbitrary
+        return;
     }
 
                                 // try the VORs next
@@ -171,16 +167,12 @@ DME::search (double frequency_mhz, double longitude_rad,
                                               latitude_rad,
                                               altitude_m);
     if (nav != 0 && nav->get_has_dme()) {
-            _transmitter_valid = true;
-            _transmitter = Point3D(nav->get_x(),
-                                   nav->get_y(),
-                                   nav->get_z());
-            _transmitter_elevation_ft = nav->get_elev() * SG_METER_TO_FEET;
-            _transmitter_range_nm = nav->get_range(); // fixme
-            return;
-        }
-    } else {
-        _transmitter_valid = false;
+        _transmitter_valid = true;
+        _transmitter = Point3D(nav->get_x(),
+                               nav->get_y(),
+                               nav->get_z());
+        _transmitter_elevation_ft = nav->get_elev() * SG_METER_TO_FEET;
+        _transmitter_range_nm = nav->get_range(); // fixme
         return;
     }