fly/flightgear
1
0
Fork 0
Code Activity

Fix bug 255, support turbulence to weather menu

Browse source
This commit is contained in:
Torsten Dreyer 2011-01-21 10:35:04 +01:00
parent d227258b3b
commit a81103341e
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Environment/Makefile.am
View file

@ -17,6 +17,6 @@ libEnvironment_a_SOURCES = \
ridge_lift.cxx ridge_lift.hxx \ ridge_lift.cxx ridge_lift.hxx \
ephemeris.cxx ephemeris.hxx \ ephemeris.cxx ephemeris.hxx \
terrainsampler.cxx terrainsampler.cxx \ terrainsampler.cxx terrainsampler.cxx \
presets.cxx presets.cxx presets.cxx presets.hxx
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src

8
src/Environment/environment.cxx
View file

@ -27,14 +27,9 @@
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/math/interpolater.hxx>
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/environment/visual_enviro.hxx>
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <signal.h>
#include "environment.hxx" #include "environment.hxx"
#include "atmosphere.hxx" #include "atmosphere.hxx"
@ -472,9 +467,6 @@ FGEnvironment::get_wind_from_down_fps () const
double double
FGEnvironment::get_turbulence_magnitude_norm () const FGEnvironment::get_turbulence_magnitude_norm () const
{ {
if( sgEnviro.get_turbulence_enable_state() )
if (fgGetBool("/environment/realwx/enabled")||fgGetBool("/environment/metar/valid"))
return sgEnviro.get_cloud_turbulence();
return turbulence_magnitude_norm; return turbulence_magnitude_norm;
} }