Merge branch 'maint' into next

src/Environment/environment.cxx

@@ -118,33 +118,39 @@ _setup_tables ()
 // Implementation of FGEnvironment.
 ////////////////////////////////////////////////////////////////////////
 
-FGEnvironment::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();
+    elevation_ft = 0;
-  _recalc_density();
+    visibility_m = 32000;
-  _recalc_relative_humidity();
+    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()
+{
+    _init();
 }
 
 FGEnvironment::FGEnvironment (const FGEnvironment &env)
 {
-    FGEnvironment();
+    _init();
     copy(env);
 }
 

src/Environment/environment.hxx

@@ -98,7 +98,7 @@ public:
   virtual void set_altitude_tropo_top_m (double alt);
 
 private:
-
+  void _init();
   void _recalc_hdgspd ();
   void _recalc_ne ();
 

src/Environment/fgclouds.cxx

@@ -51,6 +51,7 @@ FGClouds::FGClouds(FGEnvironmentCtrl * controller) :
 	station_elevation_ft(0.0),
 	_controller( controller ),
 	snd_lightning(NULL),
+    clouds_3d_enabled(false),
     last_scenario( "unset" ),
     last_env_config( new SGPropertyNode() ),
     last_env_clouds( new SGPropertyNode() )

src/Instrumentation/HUD/HUD_ladder.cxx

@@ -540,7 +540,9 @@ void HUD::Ladder::draw(void)
             // draw numbers
             std::ostringstream str;
             str << i;
-            const char *num = str.str().c_str();
+            // must keep this string, otherwise it will free the c_str!
+            string num_str = str.str();
+            const char *num = num_str.c_str();
             int valign = numoffs.y > 0 ? BOTTOM : numoffs.y < 0 ? TOP : VCENTER;
             draw_text(lo.x - numoffs.x, lo.y + numoffs.y, num,
                     valign | (numoffs.x == 0 ? CENTER : numoffs.x > 0 ? RIGHT : LEFT));