new FSF address

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

diff --git a/src/Main/util.cxx b/src/Main/util.cxx
index e2c12cd742076f2c887fb725da900fb1dfbcfe99..2a62521d4ae8d47974301d8655f765d0560a5358 100644 (file)
--- a/src/Main/util.cxx
+++ b/src/Main/util.cxx
@@ -1,5 +1,5 @@
 // util.cxx - general-purpose utility functions.
-// Copyright (C) 2002  Curtis L. Olson  - curt@me.umn.edu
+// Copyright (C) 2002  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -13,7 +13,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -32,10 +32,6 @@ SG_USING_STD(vector);
 #include "globals.hxx"
 #include "util.hxx"
 
-#if defined(FG_NETWORK_OLK)
-#include <NetworkOLK/network.h>
-#endif
-
 
 void
 fgDefaultWeatherValue (const char * propname, double value)
@@ -56,17 +52,60 @@ fgDefaultWeatherValue (const char * propname, double value)
 }
 
 
+void
+fgSetupWind (double min_hdg, double max_hdg, double speed, double gust)
+{
+                                // Initialize to a reasonable state
+  fgDefaultWeatherValue("wind-from-heading-deg", min_hdg);
+  fgDefaultWeatherValue("wind-speed-kt", speed);
+
+  SG_LOG(SG_GENERAL, SG_INFO, "WIND: " << min_hdg << '@' <<
+         speed << " knots" << endl);
+
+                                // Now, add some variety to the layers
+  min_hdg += 10;
+  if (min_hdg > 360)
+      min_hdg -= 360;
+  speed *= 1.1;
+  fgSetDouble("/environment/config/boundary/entry[1]/wind-from-heading-deg",
+              min_hdg);
+  fgSetDouble("/environment/config/boundary/entry[1]/wind-speed-kt",
+              speed);
+
+  min_hdg += 20;
+  if (min_hdg > 360)
+      min_hdg -= 360;
+  speed *= 1.1;
+  fgSetDouble("/environment/config/aloft/entry[0]/wind-from-heading-deg",
+              min_hdg);
+  fgSetDouble("/environment/config/aloft/entry[0]/wind-speed-kt",
+              speed);
+
+  min_hdg += 10;
+  if (min_hdg > 360)
+      min_hdg -= 360;
+  speed *= 1.1;
+  fgSetDouble("/environment/config/aloft/entry[1]/wind-from-heading-deg",
+              min_hdg);
+  fgSetDouble("/environment/config/aloft/entry[1]/wind-speed-kt",
+              speed);
+
+  min_hdg += 10;
+  if (min_hdg > 360)
+      min_hdg -= 360;
+  speed *= 1.1;
+  fgSetDouble("/environment/config/aloft/entry[2]/wind-from-heading-deg",
+              min_hdg);
+  fgSetDouble("/environment/config/aloft/entry[2]/wind-speed-kt",
+              speed);
+}
+
+
 void
 fgExit (int status)
 {
     SG_LOG(SG_GENERAL, SG_INFO, "Exiting FlightGear with status " << status);
 
-#if defined(FG_NETWORK_OLK)
-    if (fgGetBool("/sim/networking/network-olk"))
-       fgd_send_com("8", FGFS_host);
-#endif
-
-    globals->get_io()->shutdown_all();
     exit(status);
 }