Minor main loop/init clean-up

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

diff --git a/src/Instrumentation/rad_alt.cxx b/src/Instrumentation/rad_alt.cxx
index 4d06bb95fd740ace15d656c664ed8390baf1383e..7fe4c644be694485f723dc641d834a09566ec700 100644 (file)
--- a/src/Instrumentation/rad_alt.cxx
+++ b/src/Instrumentation/rad_alt.cxx
@@ -25,6 +25,8 @@
 #  include "config.h"
 #endif
 
+#include <Main/fg_props.hxx>
+#include <Main/globals.hxx>
 #include "rad_alt.hxx"
 
 
@@ -95,13 +97,8 @@ radAlt::init ()
 void
 radAlt::update (double delta_time_sec)
 {
-    if ( ! _sim_init_done ) {
-
-        if ( ! fgGetBool("sim/sceneryloaded", false) )
-            return;
-
-        _sim_init_done = true;
-    }
+    if (!_sceneryLoaded->getBoolValue())
+        return;
 
     if ( !_odg || ! _serviceable_node->getBoolValue() ) {
         _Instrument->setStringValue("status","");
@@ -109,16 +106,14 @@ radAlt::update (double delta_time_sec)
     }
 
     _time += delta_time_sec;
-
     if (_time < _interval)
         return;
 
     _time = 0.0;
+
     update_altitude();
 }
 
-
-
 double
 radAlt::getDistanceAntennaToHit(SGVec3d nearestHit) const 
 {
@@ -134,8 +129,8 @@ radAlt::getDistanceAntennaToHit(SGVec3d nearestHit) const
 void
 radAlt::update_altitude()
 {
-    int mode           = _radar_mode_control_node->getIntValue();
-    double tilt        = _Instrument->getDoubleValue("tilt", -85);
+//    int mode           = _radar_mode_control_node->getIntValue();
+//    double tilt        = _Instrument->getDoubleValue("tilt", -85);
     double el_limit    = _Instrument->getDoubleValue("elev-limit", 15);
     double el_step     = _Instrument->getDoubleValue("elev-step-deg", 15);
     double az_limit    = _Instrument->getDoubleValue("az-limit-deg", 15);
@@ -147,11 +142,11 @@ radAlt::update_altitude()
 
     _min_radalt = max_range;
 
-    for(double brg = -az_limit; brg <= az_limit; brg += az_step){
-        setUserPos();
-        setAntennaPos();
-        SGVec3d cartantennapos = getCartAntennaPos();
+    setUserPos();
+    setAntennaPos();
+    SGVec3d cartantennapos = getCartAntennaPos();
 
+    for(double brg = -az_limit; brg <= az_limit; brg += az_step){
         for(double elev = el_limit; elev >= - el_limit; elev -= el_step){
             setUserVec(brg, elev);