fix a pointer reference.

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

diff --git a/src/Environment/environment.cxx b/src/Environment/environment.cxx
index f915e526194fc088905ba444263fa8ce6b3c94fb..212e51d856aed4fa286ea947c63ffcd5d6e21eb3 100644 (file)
--- a/src/Environment/environment.cxx
+++ b/src/Environment/environment.cxx
@@ -29,8 +29,6 @@
 
 #include <boost/tuple/tuple.hpp>
 
-#include <plib/sg.h>
-
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/interpolater.hxx>
@@ -546,8 +544,8 @@ FGEnvironment::set_elevation_ft (double e)
 {
   elevation_ft = e;
   if( live_update ) {
-    _recalc_alt_dewpoint();
     _recalc_alt_pt();
+    _recalc_alt_dewpoint();
     _recalc_density();
     _recalc_relative_humidity();
   }
@@ -646,7 +644,7 @@ FGEnvironment::_recalc_sl_temperature ()
   double t_strato = ISA_def[1].temp - atmodel::freezing;
   if (temperature_degc < t_strato) temperature_sea_level_degc = t_strato;
   else temperature_sea_level_degc = 
-      temperature_degc - elevation_ft * ISA_def[0].lapse;
+      temperature_degc + elevation_ft * atmodel::foot * ISA_def[0].lapse;
 
 // Alternative implemenation:
 //  else temperature_sea_level_inhg = T_layer(0., elevation_ft * foot,
@@ -708,7 +706,6 @@ FGEnvironment::_recalc_alt_pt ()
         << "  and "  << temperature_sea_level_degc
         << " :: " << this
         << "  # " << count);
-        ///////////////////////////////////raise(SIGUSR1);
     }
   }
 #endif
@@ -824,7 +821,7 @@ interpolate (const FGEnvironment * env1, const FGEnvironment * env2,
                    env2->get_temperature_sea_level_degc(),
                    fraction));
 
-    result->set_dewpoint_degc
+    result->set_dewpoint_sea_level_degc
         (do_interp(env1->get_dewpoint_sea_level_degc(),
                    env2->get_dewpoint_sea_level_degc(),
                    fraction));