Disable two sided light model because Andy's patch to plib makes it unneeded. This...

[flightgear.git] / src / Main / options.cxx

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index ce4b593d5dfde68f949947a70d37ec4e26d8ee6e..53daa5c80716f8ebd4d4ec04b3b65f4215b3dcae 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -26,7 +26,7 @@
 #endif
 
 #include <simgear/compiler.h>
-#include <simgear/misc/exception.hxx>
+#include <simgear/structure/exception.hxx>
 #include <simgear/debug/logstream.hxx>
 
 #include <math.h>              // rint()
@@ -556,7 +556,7 @@ setup_wind (double min_hdg, double max_hdg, double speed, double gust)
   min_hdg += 10;
   if (min_hdg > 360)
       min_hdg -= 360;
-  speed *= 1.2;
+  speed *= 1.1;
   fgSetDouble("/environment/config/boundary/entry[1]/wind-from-heading-deg",
               min_hdg);
   fgSetDouble("/environment/config/boundary/entry[1]/wind-speed-kt",
@@ -565,7 +565,7 @@ setup_wind (double min_hdg, double max_hdg, double speed, double gust)
   min_hdg += 20;
   if (min_hdg > 360)
       min_hdg -= 360;
-  speed *= 1.5;
+  speed *= 1.1;
   fgSetDouble("/environment/config/aloft/entry[0]/wind-from-heading-deg",
               min_hdg);
   fgSetDouble("/environment/config/aloft/entry[0]/wind-speed-kt",
@@ -574,7 +574,7 @@ setup_wind (double min_hdg, double max_hdg, double speed, double gust)
   min_hdg += 10;
   if (min_hdg > 360)
       min_hdg -= 360;
-  speed *= 1.2;
+  speed *= 1.1;
   fgSetDouble("/environment/config/aloft/entry[1]/wind-from-heading-deg",
               min_hdg);
   fgSetDouble("/environment/config/aloft/entry[1]/wind-speed-kt",
@@ -583,7 +583,7 @@ setup_wind (double min_hdg, double max_hdg, double speed, double gust)
   min_hdg += 10;
   if (min_hdg > 360)
       min_hdg -= 360;
-  speed *= 1.2;
+  speed *= 1.1;
   fgSetDouble("/environment/config/aloft/entry[2]/wind-from-heading-deg",
               min_hdg);
   fgSetDouble("/environment/config/aloft/entry[2]/wind-speed-kt",
@@ -1040,7 +1040,7 @@ fgOptRandomWind( const char *arg )
 {
     double min_hdg = sg_random() * 360.0;
     double max_hdg = min_hdg + (20 - sqrt(sg_random() * 400));
-    double speed = 40 - sqrt(sg_random() * 1600.0);
+    double speed = sg_random() * sg_random() * 40;
     double gust = speed + (10 - sqrt(sg_random() * 100));
     setup_wind(min_hdg, max_hdg, speed, gust);
     return FG_OPTIONS_OK;