Fix bug 255, support turbulence to weather menu

diff --git a/src/Environment/Makefile.am b/src/Environment/Makefile.am
index 90b732315ae4aaaac15df4d9a46f5a0be723a52e..c3b1b5fbff39e77060cb6065c5e1d0dca2b10d8f 100644 (file)
--- a/src/Environment/Makefile.am
+++ b/src/Environment/Makefile.am
@@ -17,6 +17,6 @@ libEnvironment_a_SOURCES = \
        ridge_lift.cxx ridge_lift.hxx \
        ephemeris.cxx ephemeris.hxx \
        terrainsampler.cxx terrainsampler.cxx \
-       presets.cxx presets.cxx
+       presets.cxx presets.hxx
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Environment/environment.cxx b/src/Environment/environment.cxx
index a27189b24e066776539bfa997ee27eb467a2746f..4e245554b34a06b1458e05cfb77a83d1ac4318bb 100644 (file)
--- a/src/Environment/environment.cxx
+++ b/src/Environment/environment.cxx
@@ -27,14 +27,9 @@
 
 #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/environment/visual_enviro.hxx>
 
 #include <Main/fg_props.hxx>
-#include <signal.h>
 
 #include "environment.hxx"
 #include "atmosphere.hxx"
@@ -472,9 +467,6 @@ FGEnvironment::get_wind_from_down_fps () const
 double
 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;
 }