Minor main loop/init clean-up

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

diff --git a/src/Instrumentation/agradar.cxx b/src/Instrumentation/agradar.cxx
index 0688a8ff8b97b79df3849663848a2d80fb42f1a0..768fdea41d385ecc8f773585b498dfd481c18a29 100644 (file)
--- a/src/Instrumentation/agradar.cxx
+++ b/src/Instrumentation/agradar.cxx
@@ -102,13 +102,8 @@ agRadar::init ()
 void
 agRadar::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","");
@@ -122,7 +117,6 @@ agRadar::update (double delta_time_sec)
 
     _time = 0.0;
 
-   
     update_terrain();
 //    wxRadarBg::update(delta_time_sec);
 }
@@ -189,7 +183,6 @@ agRadar::setUserVec(double az, double el)
     float yaw   = _user_hdg_deg_node->getDoubleValue();
     float pitch = _user_pitch_deg_node->getDoubleValue();
     float roll  = _user_roll_deg_node->getDoubleValue();
-    int mode    = _radar_mode_control_node->getIntValue();
     double tilt = _Instrument->getDoubleValue("tilt");
     double trk  = _Instrument->getDoubleValue("trk");
     bool roll_stab   = _Instrument->getBoolValue("stabilisation/roll");
@@ -217,18 +210,20 @@ agRadar::setUserVec(double az, double el)
 bool
 agRadar::getMaterial(){
 
-    if (globals->get_scenery()->get_elevation_m(hitpos, _elevation_m, &_material)){
+    const simgear::BVHMaterial* mat = 0;
+    if (globals->get_scenery()->get_elevation_m(hitpos, _elevation_m, &mat)){
         //_ht_agl_ft = pos.getElevationFt() - _elevation_m * SG_METER_TO_FEET;
-        if (_material) {
-            const vector<string>& names = _material->get_names();
+        const SGMaterial* material = dynamic_cast<const SGMaterial*>(mat);
+        if (material) {
+            const std::vector<std::string>& names = material->get_names();
 
-            _solid = _material->get_solid();
-            _load_resistance = _material->get_load_resistance();
-            _frictionFactor =_material->get_friction_factor();
-            _bumpinessFactor = _material->get_bumpiness();
+            _solid = material->get_solid();
+            _load_resistance = material->get_load_resistance();
+            _frictionFactor = material->get_friction_factor();
+            _bumpinessFactor = material->get_bumpiness();
 
             if (!names.empty()) 
-                _mat_name = names[0].c_str();
+                _mat_name = names[0];
             else
                 _mat_name = "";
 
@@ -260,8 +255,7 @@ agRadar::update_terrain()
     double tilt = -2.5;
     bool roll_stab   = _rollStabNode->getBoolValue();
     bool pitch_stab  = _pitchStabNode->getBoolValue();
-    //string status = "";
-    const char* status;
+    const char* status = "";
     bool hdg_mkr = true;
 
     if (mode == 5){