diff --git a/src/Instrumentation/newnavradio.cxx b/src/Instrumentation/newnavradio.cxx index 2678ff8a0..6dff4e88f 100644 --- a/src/Instrumentation/newnavradio.cxx +++ b/src/Instrumentation/newnavradio.cxx @@ -785,7 +785,7 @@ void GS::update( double dt, const SGGeod & aircraftPosition ) double offset = _targetGlideslope_deg - gsDirect; if( offset < 0.0 ) offset = _targetGlideslope_deg/2 * sawtooth(2.0*offset/_targetGlideslope_deg); - assert( !SGMisc::isNaN(offset) ); + assert( !SGMisc::isNaN(offset) ); // GS is documented to be 1.4 degrees thick, // i.e. plus or minus 0.7 degrees from the midline: _glideslopeOffset_norm = SGMiscd::clip(offset/0.7, -1.0, 1.0); diff --git a/src/Scenery/scenery.cxx b/src/Scenery/scenery.cxx index bb093f347..c6ccdfa0c 100644 --- a/src/Scenery/scenery.cxx +++ b/src/Scenery/scenery.cxx @@ -280,10 +280,8 @@ public: { SGPropertyNode_ptr elevationMeshNode = fgGetNode(root_node_path, true); setupPropertyListener(elevationMeshNode, "constraint-gap-m"); - setupPropertyListener(elevationMeshNode, "lod-range-factor"); setupPropertyListener(elevationMeshNode, "sample-ratio"); setupPropertyListener(elevationMeshNode, "vertical-scale"); - setupPropertyListener(elevationMeshNode, "separate-water-mesh"); // We also need to set the maximum range based on the LOD ranges SGPropertyNode_ptr lodNode = fgGetNode(lod_node_path, true); @@ -308,7 +306,6 @@ public: virtual void valueChanged(SGPropertyNode * node) { float f = node->getFloatValue(); - bool b = node->getBoolValue(); std::string name(node->getNameString()); if (name == "constraint-gap-m") { @@ -317,8 +314,6 @@ public: SGSceneFeatures::instance()->setVPBSampleRatio(f); } else if (name == "vertical-scale") { SGSceneFeatures::instance()->setVPBVerticalScale(f); - } else if (name == "separate-water-mesh") { - SGSceneFeatures::instance()->setVPBSeparateWaterMesh(b); } else { SG_LOG(SG_TERRAIN, SG_ALERT, "Unexpected property in listener " << node->getPath()); }