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 b5cd064f2a291c62c93151ec88b3cc3912f4333c..768fdea41d385ecc8f773585b498dfd481c18a29 100644 (file)
--- a/src/Instrumentation/agradar.cxx
+++ b/src/Instrumentation/agradar.cxx
@@ -210,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 = "";