1
0
Fork 0

FGEnvironment: fix broken copy constructor.

Noticed by Csaba Halász.
This commit is contained in:
Tim Moore 2009-01-14 09:19:41 +01:00
parent da8dd13138
commit 736823d032
2 changed files with 29 additions and 23 deletions

View file

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

View file

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