Add Nasal Vs. 1.5

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

diff --git a/src/Environment/environment.cxx b/src/Environment/environment.cxx
index e6eb0b8a6648d95b4ee87418ec3259f01e1807e1..47e4d061f58959d27868c5e4c0fadd92454c8888 100644 (file)
--- a/src/Environment/environment.cxx
+++ b/src/Environment/environment.cxx
@@ -184,14 +184,14 @@ FGEnvironment::read (const SGPropertyNode * node)
     maybe_copy_value(this, node, "visibility-m",
                      &FGEnvironment::set_visibility_m);
 
-    if (!maybe_copy_value(this, node, "temperature-degc",
+    if (!maybe_copy_value(this, node, "temperature-sea-level-degc",
                           &FGEnvironment::set_temperature_sea_level_degc))
-        maybe_copy_value(this, node, "temperature-sea-level-degc",
+        maybe_copy_value(this, node, "temperature-degc",
                          &FGEnvironment::set_temperature_degc);
 
-    if (!maybe_copy_value(this, node, "dewpoint-degc",
+    if (!maybe_copy_value(this, node, "dewpoint-sea-level-degc",
                           &FGEnvironment::set_dewpoint_sea_level_degc))
-        maybe_copy_value(this, node, "dewpoint-sea-level-degc",
+        maybe_copy_value(this, node, "dewpoint-degc",
                          &FGEnvironment::set_dewpoint_degc);
 
     if (!maybe_copy_value(this, node, "pressure-sea-level-inhg",
@@ -576,14 +576,14 @@ interpolate (const FGEnvironment * env1, const FGEnvironment * env2,
                    env2->get_visibility_m(),
                    fraction));
 
-    result->set_temperature_degc
-        (do_interp(env1->get_temperature_degc(),
-                   env2->get_temperature_degc(),
+    result->set_temperature_sea_level_degc
+        (do_interp(env1->get_temperature_sea_level_degc(),
+                   env2->get_temperature_sea_level_degc(),
                    fraction));
 
     result->set_dewpoint_degc
-        (do_interp(env1->get_dewpoint_degc(),
-                   env2->get_dewpoint_degc(),
+        (do_interp(env1->get_dewpoint_sea_level_degc(),
+                   env2->get_dewpoint_sea_level_degc(),
                    fraction));
 
     result->set_pressure_sea_level_inhg