Add Nasal Vs. 1.5

[flightgear.git] / src / Environment / environment_ctrl.cxx

diff --git a/src/Environment/environment_ctrl.cxx b/src/Environment/environment_ctrl.cxx
index 97e3369c9d3fc84829c5706aae8e0fc46c32fd8b..eb2761b12a58099081fbb36401c2e866c4004583 100644 (file)
--- a/src/Environment/environment_ctrl.cxx
+++ b/src/Environment/environment_ctrl.cxx
@@ -23,10 +23,14 @@
 #include <simgear/debug/logstream.hxx>
 
 #include <stdlib.h>
+#include <algorithm>
+
 #include <Main/fg_props.hxx>
 
 #include "environment_ctrl.hxx"
 
+SG_USING_STD(sort);
+
 
 \f
 ////////////////////////////////////////////////////////////////////////
@@ -168,9 +172,10 @@ FGInterpolateEnvironmentCtrl::FGInterpolateEnvironmentCtrl ()
 
 FGInterpolateEnvironmentCtrl::~FGInterpolateEnvironmentCtrl ()
 {
-    for (int i = 0; i < _boundary_table.size(); i++)
+    unsigned int i;
+    for (i = 0; i < _boundary_table.size(); i++)
         delete _boundary_table[i];
-    for (int i = 0; i < _aloft_table.size(); i++)
+    for (i = 0; i < _aloft_table.size(); i++)
         delete _aloft_table[i];
 }
 
@@ -188,9 +193,10 @@ FGInterpolateEnvironmentCtrl::init ()
 void
 FGInterpolateEnvironmentCtrl::reinit ()
 {
-    for (int i = 0; i < _boundary_table.size(); i++)
+    unsigned int i;
+    for (i = 0; i < _boundary_table.size(); i++)
         delete _boundary_table[i];
-    for (int i = 0; i < _aloft_table.size(); i++)
+    for (i = 0; i < _aloft_table.size(); i++)
         delete _aloft_table[i];
     _boundary_table.clear();
     _aloft_table.clear();
@@ -203,8 +209,10 @@ FGInterpolateEnvironmentCtrl::read_table (const SGPropertyNode * node,
 {
     for (int i = 0; i < node->nChildren(); i++) {
         const SGPropertyNode * child = node->getChild(i);
-        if (!strcmp(child->getName(), "entry") &&
-            child->getStringValue("elevation-ft", "")[0] != '\0') {
+        if ( strcmp(child->getName(), "entry") == 0
+            && child->getStringValue("elevation-ft", "")[0] != '\0'
+            && ( child->getDoubleValue("elevation-ft") > 0.1 || i == 0 ) )
+       {
             bucket * b = new bucket;
             if (i > 0)
                 b->environment.copy(table[i-1]->environment);
@@ -225,7 +233,7 @@ FGInterpolateEnvironmentCtrl::update (double delta_time_sec)
     double boundary_transition =
         fgGetDouble("/environment/config/boundary-transition-ft", 500);
 
-    double ground_elevation_ft = altitude_ft - altitude_agl_ft;
+    // double ground_elevation_ft = altitude_ft - altitude_agl_ft;
 
     int length = _boundary_table.size();