X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FEnvironment%2Fenvironment_ctrl.cxx;h=98f59cb9ef61eb1694f5d74dbd0c995d2095f043;hb=a1031b052dd40ca3a4ea68dcd7f572b7d9e4bb24;hp=48b71dfee7691307d18b872ce783fdcc445e05ac;hpb=121190e73ac560e1d0e52b5f70e705b21905089c;p=flightgear.git

diff --git a/src/Environment/environment_ctrl.cxx b/src/Environment/environment_ctrl.cxx
index 48b71dfee..98f59cb9e 100644
--- a/src/Environment/environment_ctrl.cxx
+++ b/src/Environment/environment_ctrl.cxx
@@ -26,6 +26,7 @@
 
 #include <algorithm>
 
+#include <simgear/math/SGMath.hxx>
 #include <Main/fg_props.hxx>
 #include "environment_ctrl.hxx"
 #include "environment.hxx"
@@ -123,7 +124,7 @@ private:
     LayerTable _aloft_table;
 
     FGEnvironment _environment;
-    TiedPropertyList _tiedProperties;
+    simgear::TiedPropertyList _tiedProperties;
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -182,7 +183,7 @@ void LayerTable::read(FGEnvironment * parent )
     // cleanup entries with (almost)same altitude
     for( size_type n = 1; n < size(); n++ ) {
         if( fabs(at(n)->altitude_ft - at(n-1)->altitude_ft ) < 1 ) {
-            SG_LOG( SG_GENERAL, SG_ALERT, "Removing duplicate altitude entry in environment config for altitude " << at(n)->altitude_ft );
+            SG_LOG( SG_ENVIRONMENT, SG_ALERT, "Removing duplicate altitude entry in environment config for altitude " << at(n)->altitude_ft );
             erase( begin() + n );
         }
     }
@@ -193,9 +194,9 @@ void LayerTable::Bind()
     // tie all environments to ~/entry[n]/xxx
     // register this as a changelistener of ~/entry[n]/pressure-sea-level-inhg
     for( unsigned i = 0; i < size(); i++ ) {
-        SGPropertyNode_ptr baseNode = _rootNode->getChild("entry", i, true );
-        at(i)->environment.Tie( baseNode );
-        baseNode->getNode( "pressure-sea-level-inhg", true )->addChangeListener( this );
+        SGPropertyNode_ptr baseNode = _rootNode->getChild("entry", i, true );
+        at(i)->environment.Tie( baseNode );
+        baseNode->getNode( "pressure-sea-level-inhg", true )->addChangeListener( this );
     }
 }
 
@@ -204,9 +205,9 @@ void LayerTable::Unbind()
     // untie all environments to ~/entry[n]/xxx
     // deregister this as a changelistener of ~/entry[n]/pressure-sea-level-inhg
     for( unsigned i = 0; i < size(); i++ ) {
-        SGPropertyNode_ptr baseNode = _rootNode->getChild("entry", i, true );
+        SGPropertyNode_ptr baseNode = _rootNode->getChild("entry", i, true );
         at(i)->environment.Untie();
-        baseNode->getNode( "pressure-sea-level-inhg", true )->removeChangeListener( this );
+        baseNode->getNode( "pressure-sea-level-inhg", true )->removeChangeListener( this );
     }
 }