Updated ...

diff --git a/Makefile.am b/Makefile.am
index 9a5e299cd21f58f3bb6c498f4cece4ea597efea4..000fb5a50b10f8507ca651047da2f30a7392982f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ fgfs-base: fgfs-base-tar fgfs-base-zip
 
 fgfs-base-tar:
        (cd $(HOME); \
-       tar czvf fgfs-base-$(VERSION).tar.gz \
+       tar czvf fgfs-base-$(VERSION)c.tar.gz \
        FlightGear/[A-CE-R]* \
        FlightGear/Scenery/w120n30/w111n33 \
        FlightGear/Sounds \
@@ -32,13 +32,21 @@ fgfs-base-tar:
 
 fgfs-base-zip:
        (cd $(HOME); \
-       zip -ryv fgfs-base-$(VERSION).zip \
+       zip -ryv fgfs-base-$(VERSION)c.zip \
        FlightGear/[A-CE-R]* \
        FlightGear/Scenery/w120n30/w111n33 \
        FlightGear/Sounds \
        FlightGear/Textures FlightGear/Thanks \
        FlightGear/[T-W]* FlightGear/[c-z]*)
 
+fgfs-base-patch:
+       (cd $(HOME); \
+       tar --newer 2/17/2000 -czvf fgfs-base-patch-$(VERSION)c.tar.gz \
+       FlightGear/[A-CE-R]* \
+       FlightGear/Scenery/w120n30/w111n33 \
+       FlightGear/Sounds \
+       FlightGear/[T-W]* FlightGear/[c-m]*)
+
 # make the mini JSBsim data distribution
 jsbsim-data:
        (cd $(HOME); \

diff --git a/Thanks b/Thanks
index 2b6a4deb59d43388bc962259535bf9857bb4c574..ffdfd7803a41f4a7609d9ba7c404fcb286d2ccb3 100644 (file)
--- a/Thanks
+++ b/Thanks
@@ -128,6 +128,10 @@ Michael I. Gold <gold@puck.asd.sgi.com>
   His effort alone has made me a great SGI fan.
 
 
+Habibie <habibie@MailandNews.com>
+  RedHat package building changes for SimGear.
+
+
 Charlie Hotchkiss <clhotch@pacbell.net> 
   Worked on improving and enhancing the HUD code.
   Lots of code style tips and code tweaks ...
@@ -200,6 +204,11 @@ Alan Murta <amurta@cs.man.ac.uk>
   Created the Generic Polygon Clipping library
 
 
+Phil Nelson  <phil@cs.wwu.edu>
+  Author of GNU dbm.  gdbm is a set of database routines that use
+  extendible hashing and works similar to the standard UNIX dbm routines.
+
+
 Alexei Novikov <anovikov@heron.itep.ru>
   Created European Scenery
   Contributed a script to turn fgfs scenery into beautifully rendered 
@@ -360,6 +369,13 @@ Darrell Walisser <dwaliss1@purdue.edu>
   Provides MacOS-specific info in the docs.
 
 
+Ed Williams <Ed_Williams@compuserve.com>
+  Contributed magnetic variation code (impliments Nima WMM 2000)
+  We've also borrowed from Ed's wonderful aviation formulary at various
+  times as well.
+  http://www.best.com/~williams/index.html
+
+
 WoodSoup Project  http://www.woodsoup.org
   Provided computing resources and services so that the Flight Gear 
   project could have real home.  This includes, web services, 

diff --git a/src/Cockpit/steam.cxx b/src/Cockpit/steam.cxx
index 27ca2bdf0e969fff5bcb97652e61fbd577dbe8ce..d3dda3f9800bcebd89991c0346804fff481341cf 100644 (file)
--- a/src/Cockpit/steam.cxx
+++ b/src/Cockpit/steam.cxx
@@ -63,8 +63,12 @@ double FGSteam::get_VSI_fps() { _CatchUp(); return the_VSI_fps; }
 double FGSteam::the_VACUUM_inhg = 0.0;
 double FGSteam::get_VACUUM_inhg() { _CatchUp(); return the_VACUUM_inhg; }
 
-double FGSteam::get_MH_deg () { return FGBFI::getHeading () - VARY_E; }
-double FGSteam::get_DG_deg () { return FGBFI::getHeading () - VARY_E; }
+double FGSteam::get_MH_deg () {
+    return FGBFI::getHeading () - FGBFI::getMagVar ();
+}
+double FGSteam::get_DG_deg () {
+    return FGBFI::getHeading () - FGBFI::getMagVar ();
+}
 
 double FGSteam::get_TC_rad   () { return FGBFI::getSideSlip (); }
 double FGSteam::get_TC_radps () { return FGBFI::getRoll (); }
@@ -246,7 +250,7 @@ double FGSteam::get_HackVOR1_deg ()
        y = 60.0 * ( NAV1_Lat - FGBFI::getLatitude () );
        x = 60.0 * ( NAV1_Lon - FGBFI::getLongitude() )
                        * cos ( FGBFI::getLatitude () / RAD_TO_DEG );
-       r = atan2 ( x, y ) * RAD_TO_DEG - NAV1_Rad - VARY_E;
+       r = atan2 ( x, y ) * RAD_TO_DEG - NAV1_Rad - FGBFI::getMagVar();
        if (r> 180.0) r-=360.0; else
        if (r<-180.0) r+=360.0;
        if ( fabs(r) > 90.0 )
@@ -262,7 +266,7 @@ double FGSteam::get_HackVOR2_deg ()
        y = 60.0 * ( NAV2_Lat - FGBFI::getLatitude () );
        x = 60.0 * ( NAV2_Lon - FGBFI::getLongitude() )
                        * cos ( FGBFI::getLatitude () / RAD_TO_DEG );
-       r = atan2 ( x, y ) * RAD_TO_DEG - NAV2_Rad - VARY_E;
+       r = atan2 ( x, y ) * RAD_TO_DEG - NAV2_Rad - FGBFI::getMagVar();
        if (r> 180.0) r-=360.0; else
        if (r<-180.0) r+=360.0;
        if ( fabs(r) > 90.0 )