Merge branch 'maint' into next

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

diff --git a/src/Environment/environment.cxx b/src/Environment/environment.cxx
index 026ebdcb8c3a7634f73252dacd873ceb155e9772..c51752c5544e501021675d19a1cab0aaf6d746be 100644 (file)
--- a/src/Environment/environment.cxx
+++ b/src/Environment/environment.cxx
@@ -25,10 +25,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>                     
-#endif
-
 #include <math.h>
 
 #include <plib/sg.h>
@@ -122,33 +118,39 @@ _setup_tables ()
 // Implementation of FGEnvironment.
 ////////////////////////////////////////////////////////////////////////
 
+void FGEnvironment::_init()
+{
+    elevation_ft = 0;
+    visibility_m = 32000;
+    temperature_sea_level_degc = 15;
+    temperature_degc = 15;
+    dewpoint_sea_level_degc = 5; // guess
+    dewpoint_degc = 5;
+    pressure_sea_level_inhg = 29.92;
+    pressure_inhg = 29.92;
+    turbulence_magnitude_norm = 0;
+    turbulence_rate_hz = 1;
+    wind_from_heading_deg = 0;
+    wind_speed_kt = 0;
+    wind_from_north_fps = 0;
+    wind_from_east_fps = 0;
+    wind_from_down_fps = 0;
+    altitude_half_to_sun_m = 1000;
+    altitude_tropo_top_m = 10000;
+    _setup_tables();
+    _recalc_density();
+    _recalc_relative_humidity();
+    
+}
+
 FGEnvironment::FGEnvironment()
-  : elevation_ft(0),
-    visibility_m(32000),
-    temperature_sea_level_degc(15),
-    temperature_degc(15),
-    dewpoint_sea_level_degc(5), // guess
-    dewpoint_degc(5),
-    pressure_sea_level_inhg(29.92),
-    pressure_inhg(29.92),
-    turbulence_magnitude_norm(0),
-    turbulence_rate_hz(1),
-    wind_from_heading_deg(0),
-    wind_speed_kt(0),
-    wind_from_north_fps(0),
-    wind_from_east_fps(0),
-    wind_from_down_fps(0),
-    altitude_half_to_sun_m(1000),
-    altitude_tropo_top_m(10000)
-{
-  _setup_tables();
-  _recalc_density();
-  _recalc_relative_humidity();
+{
+    _init();
 }
 
 FGEnvironment::FGEnvironment (const FGEnvironment &env)
 {
-    FGEnvironment();
+    _init();
     copy(env);
 }