X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fbfi.cxx;h=6e7761d638f8a3157af03dd4aa44cf61598b67d6;hb=8a7e5eeaf2d7bc923437c7d0dee74f99ab3d8a8d;hp=441004135d6b5ae6430efe415deb0efa7e768e6e;hpb=0ffa19cd32c02405d0e740393b37f4009ed5a312;p=flightgear.git

diff --git a/src/Main/bfi.cxx b/src/Main/bfi.cxx
index 441004135..6e7761d63 100644
--- a/src/Main/bfi.cxx
+++ b/src/Main/bfi.cxx
@@ -20,21 +20,12 @@
 //
 // $Id$
 
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#if defined( FG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
-#else
-#  include <iostream>
-#endif
+#include "fgfs.hxx"
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/ephemeris/ephemeris.hxx>
-#include <simgear/math/fg_types.hxx>
+#include <simgear/math/sg_types.hxx>
 #include <simgear/misc/props.hxx>
 #include <simgear/timing/sg_time.hxx>
 
@@ -48,15 +39,16 @@
 #include <Time/sunpos.hxx>
 #include <Time/tmp.hxx>
 #include <Cockpit/radiostack.hxx>
+#include <Cockpit/panel.hxx>
 #ifndef FG_OLD_WEATHER
 #  include <WeatherCM/FGLocalWeatherDatabase.h>
 #else
 #  include <Weather/weather.hxx>
 #endif
 
-#include "options.hxx"
-#include "save.hxx"
+#include "globals.hxx"
 #include "fg_init.hxx"
+#include "fg_props.hxx"
 
 FG_USING_NAMESPACE(std);
 
@@ -69,7 +61,150 @@ FG_USING_NAMESPACE(std);
 // Static variables.
 ////////////////////////////////////////////////////////////////////////
 
-bool FGBFI::_needReinit = false;
+				// Yech -- not thread-safe, etc. etc.
+static bool _needReinit = false;
+static string _temp;
+
+static inline void needReinit ()
+{
+  _needReinit = true;
+}
+
+
+/**
+ * Reinitialize FGFS to use the new BFI settings.
+ */
+static inline void
+reinit ()
+{
+				// Save the state of everything
+				// that's going to get clobbered
+				// when we reinit the subsystems.
+
+  FG_LOG(FG_GENERAL, FG_INFO, "Starting BFI reinit");
+
+				// TODO: add more AP stuff
+  double elevator = FGBFI::getElevator();
+  double aileron = FGBFI::getAileron();
+  double rudder = FGBFI::getRudder();
+  double throttle = FGBFI::getThrottle();
+  double elevator_trim = FGBFI::getElevatorTrim();
+  double flaps = FGBFI::getFlaps();
+  double brake = FGBFI::getBrakes();
+  bool apHeadingLock = FGBFI::getAPHeadingLock();
+  double apHeadingMag = FGBFI::getAPHeadingMag();
+  bool apAltitudeLock = FGBFI::getAPAltitudeLock();
+  double apAltitude = FGBFI::getAPAltitude();
+  const string &targetAirport = FGBFI::getTargetAirport();
+  bool gpsLock = FGBFI::getGPSLock();
+  // double gpsLatitude = FGBFI::getGPSTargetLatitude();
+  // double gpsLongitude = FGBFI::getGPSTargetLongitude();
+
+  FGBFI::setTargetAirport("");
+
+  fgReInitSubsystems();
+
+				// FIXME: this is wrong.
+				// All of these are scheduled events,
+				// and it should be possible to force
+				// them all to run once.
+  fgUpdateSunPos();
+  fgUpdateMoonPos();
+  cur_light_params.Update();
+  fgUpdateLocalTime();
+  fgUpdateWeatherDatabase();
+  fgRadioSearch();
+
+				// Restore all of the old states.
+  FGBFI::setElevator(elevator);
+  FGBFI::setAileron(aileron);
+  FGBFI::setRudder(rudder);
+  FGBFI::setThrottle(throttle);
+  FGBFI::setElevatorTrim(elevator_trim);
+  FGBFI::setFlaps(flaps);
+  FGBFI::setBrakes(brake);
+  FGBFI::setAPHeadingLock(apHeadingLock);
+  FGBFI::setAPHeadingMag(apHeadingMag);
+  FGBFI::setAPAltitudeLock(apAltitudeLock);
+  FGBFI::setAPAltitude(apAltitude);
+  FGBFI::setTargetAirport(targetAirport);
+  FGBFI::setGPSLock(gpsLock);
+
+  _needReinit = false;
+
+  FG_LOG(FG_GENERAL, FG_INFO, "Ending BFI reinit");
+}
+
+// BEGIN: kludge 2000-12-07
+// This is a kludge around a LaRCsim problem; see setAltitude()
+// for details.
+static int _altitude_countdown = 0;
+static double _requested_altitude = -9999;
+static bool _saved_freeze = false;
+static inline void _check_altitude ()
+{
+  if (_altitude_countdown > 0) {
+    _altitude_countdown--;
+    if (_altitude_countdown == 0) {
+      current_aircraft.fdm_state->set_Altitude(_requested_altitude);
+      globals->set_freeze(_saved_freeze);
+    }
+  }
+}
+
+static int _lighting_countdown = 0;
+static inline void _check_lighting ()
+{
+  if (_lighting_countdown > 0) {
+    _lighting_countdown--;
+    if (_lighting_countdown == 0)
+      fgUpdateSkyAndLightingParams();
+  }
+}
+// END: kludge
+
+
+// BEGIN: kludge
+// Allow the view to be set from two axes (i.e. a joystick hat)
+// This needs to be in FGViewer itself, somehow.
+static double axisLong = 0.0;
+static double axisLat = 0.0;
+
+static inline void
+_set_view_from_axes ()
+{
+				// Take no action when hat is centered
+  if (axisLong == 0 && axisLat == 0)
+    return;
+
+  double viewDir = 0;
+
+  if (axisLong < 0) {		// Longitudinal axis forward
+    if (axisLat < 0)
+      viewDir = 45;
+    else if (axisLat > 0)
+      viewDir = 315;
+    else
+      viewDir = 0;
+  } else if (axisLong > 0) {	// Longitudinal axis backward
+    if (axisLat < 0)
+      viewDir = 135;
+    else if (axisLat > 0)
+      viewDir = 225;
+    else
+      viewDir = 180;
+  } else {			// Longitudinal axis neutral
+    if (axisLat < 0)
+      viewDir = 90;
+    else
+      viewDir = 270;
+  }
+
+  globals->get_current_view()->set_goal_view_offset(viewDir*DEG_TO_RAD);
+//   globals->get_current_view()->set_view_offset(viewDir*DEG_TO_RAD);
+}
+
+// END: kludge
 
 
 
@@ -77,7 +212,6 @@ bool FGBFI::_needReinit = false;
 // Local functions
 ////////////////////////////////////////////////////////////////////////
 
-
 /**
  * Initialize the BFI by binding its functions to properties.
  *
@@ -89,115 +223,108 @@ FGBFI::init ()
 {
   FG_LOG(FG_GENERAL, FG_INFO, "Starting BFI init");
 				// Simulation
-  current_properties.tieInt("/sim/flight-model",
-			    getFlightModel, setFlightModel);
-//   current_properties.tieString("/sim/aircraft",
-// 			       getAircraft, setAircraft);
-  // TODO: timeGMT
-  current_properties.tieBool("/sim/hud/visibility",
-			     getHUDVisible, setHUDVisible);
-  current_properties.tieBool("/sim/panel/visibility",
-			     getPanelVisible, setPanelVisible);
+  fgTie("/sim/flight-model", getFlightModel, setFlightModel);
+  fgTie("/sim/aircraft", getAircraft, setAircraft);
+  fgTie("/sim/aircraft-dir", getAircraftDir, setAircraftDir);
+  fgTie("/sim/time/gmt", getDateString, setDateString);
+  fgTie("/sim/time/gmt-string", getGMTString);
+  fgTie("/sim/hud/visibility", getHUDVisible, setHUDVisible);
+  fgTie("/sim/panel/visibility", getPanelVisible, setPanelVisible);
+  fgTie("/sim/panel/x-offset", getPanelXOffset, setPanelXOffset);
+  fgTie("/sim/panel/y-offset", getPanelYOffset, setPanelYOffset);
 
 				// Position
-  current_properties.tieDouble("/position/latitude",
-				getLatitude, setLatitude);
-  current_properties.tieDouble("/position/longitude",
-			       getLongitude, setLongitude);
-  current_properties.tieDouble("/position/altitude",
-			       getAltitude, setAltitude);
-  current_properties.tieDouble("/position/altitude-agl",
-			       getAGL, 0);
+  fgTie("/position/airport-id", getTargetAirport, setTargetAirport);
+  fgTie("/position/latitude", getLatitude, setLatitude);
+  fgTie("/position/longitude", getLongitude, setLongitude);
+  fgTie("/position/altitude", getAltitude, setAltitude);
+  fgTie("/position/altitude-agl", getAGL);
 
 				// Orientation
-  current_properties.tieDouble("/orientation/heading",
-			       getHeading, setHeading);
-  current_properties.tieDouble("/orientation/heading-magnetic",
-			       getHeadingMag, 0);
-  current_properties.tieDouble("/orientation/pitch",
-			       getPitch, setPitch);
-  current_properties.tieDouble("/orientation/roll",
-			       getRoll, setRoll);
+  fgTie("/orientation/heading", getHeading, setHeading);
+  fgTie("/orientation/heading-magnetic", getHeadingMag);
+  fgTie("/orientation/pitch", getPitch, setPitch);
+  fgTie("/orientation/roll", getRoll, setRoll);
+
+				// Engine
+  fgTie("/engines/engine0/rpm", getRPM);
+  fgTie("/engines/engine0/egt", getEGT);
+  fgTie("/engines/engine0/cht", getCHT);
+  fgTie("/engines/engine0/mp", getMP);
 
 				// Velocities
-  current_properties.tieDouble("/velocities/airspeed",
-			       getAirspeed, 0);
-  current_properties.tieDouble("/velocities/side-slip",
-			       getSideSlip, 0);
-  current_properties.tieDouble("/velocities/vertical-speed",
-			       getVerticalSpeed, 0);
-  current_properties.tieDouble("/velocities/speed-north",
-			       getSpeedNorth, setSpeedNorth);
-  current_properties.tieDouble("/velocities/speed-east",
-			       getSpeedEast, setSpeedEast);
-  current_properties.tieDouble("/velocities/speed-down",
-			       getSpeedDown, setSpeedDown);
+  fgTie("/velocities/airspeed", getAirspeed, setAirspeed);
+  fgTie("/velocities/side-slip", getSideSlip);
+  fgTie("/velocities/vertical-speed", getVerticalSpeed);
+  fgTie("/velocities/speed-north", getSpeedNorth);
+  fgTie("/velocities/speed-east", getSpeedEast);
+  fgTie("/velocities/speed-down", getSpeedDown);
 
 				// Controls
-  current_properties.tieDouble("/controls/throttle",
-			       getThrottle, setThrottle);
-  current_properties.tieDouble("/controls/flaps",
-			       getFlaps, setFlaps);
-  current_properties.tieDouble("/controls/aileron",
-			       getAileron, setAileron);
-  current_properties.tieDouble("/controls/rudder",
-			       getRudder, setRudder);
-  current_properties.tieDouble("/controls/elevator",
-			       getElevator, setElevator);
-  current_properties.tieDouble("/controls/elevator-trim",
-			       getElevatorTrim, setElevatorTrim);
-  current_properties.tieDouble("/controls/brake",
-			       getBrake, setBrake);
+#if 0
+  fgTie("/controls/throttle", getThrottle, setThrottle);
+  fgTie("/controls/mixture", getMixture, setMixture);
+  fgTie("/controls/propellor-pitch", getPropAdvance, setPropAdvance);
+  fgTie("/controls/flaps", getFlaps, setFlaps);
+  fgTie("/controls/aileron", getAileron, setAileron);
+  fgTie("/controls/rudder", getRudder, setRudder);
+  fgTie("/controls/elevator", getElevator, setElevator);
+  fgTie("/controls/elevator-trim", getElevatorTrim, setElevatorTrim);
+  fgTie("/controls/brakes/all", getBrakes, setBrakes);
+  fgTie("/controls/brakes/left", getLeftBrake, setLeftBrake);
+  fgTie("/controls/brakes/right", getRightBrake, setRightBrake);
+  fgTie("/controls/brakes/center", getRightBrake, setCenterBrake);
+#endif
 
 				// Autopilot
-  current_properties.tieBool("/autopilot/locks/altitude",
-			     getAPAltitudeLock, setAPAltitudeLock);
-  current_properties.tieDouble("/autopilot/settings/altitude",
-			       getAPAltitude, setAPAltitude);
-  current_properties.tieBool("/autopilot/locks/heading",
-			     getAPHeadingLock, setAPHeadingLock);
-  current_properties.tieDouble("/autopilot/settings/heading-magnetic",
-			       getAPHeadingMag, setAPHeadingMag);
-  current_properties.tieBool("/autopilot/locks/nav1",
-			     getAPNAV1Lock, setAPNAV1Lock);
+  fgTie("/autopilot/locks/altitude", getAPAltitudeLock, setAPAltitudeLock);
+  fgTie("/autopilot/settings/altitude", getAPAltitude, setAPAltitude);
+  fgTie("/autopilot/locks/heading", getAPHeadingLock, setAPHeadingLock);
+  fgTie("/autopilot/settings/heading", getAPHeading, setAPHeading);
+  fgTie("/autopilot/settings/heading-magnetic",
+             getAPHeadingMag, setAPHeadingMag);
+  fgTie("/autopilot/locks/nav1", getAPNAV1Lock, setAPNAV1Lock);
 
 				// Radio navigation
-  current_properties.tieDouble("/radios/nav1/frequencies/selected",
-			       getNAV1Freq, setNAV1Freq);
-  current_properties.tieDouble("/radios/nav1/frequencies/standby",
-			       getNAV1AltFreq, setNAV1AltFreq);
-  current_properties.tieDouble("/radios/nav1/radials/actual",
-			       getNAV1Radial, 0);
-  current_properties.tieDouble("/radios/nav1/radials/selected",
-			       getNAV1SelRadial, setNAV1SelRadial);
-  current_properties.tieDouble("/radios/nav1/dme/distance",
-			       getNAV1DistDME, 0);
-  current_properties.tieBool("/radios/nav1/in-range",
-			     getNAV1InRange, 0);
-  current_properties.tieBool("/radios/nav1/dme/in-range",
-			     getNAV1DMEInRange, 0);
+  fgTie("/radios/nav1/frequencies/selected", getNAV1Freq, setNAV1Freq);
+  fgTie("/radios/nav1/frequencies/standby", getNAV1AltFreq, setNAV1AltFreq);
+  fgTie("/radios/nav1/radials/actual", getNAV1Radial);
+  fgTie("/radios/nav1/radials/selected",
+             getNAV1SelRadial, setNAV1SelRadial);
+  fgTie("/radios/nav1/dme/distance", getNAV1DistDME);
+  fgTie("/radios/nav1/to-flag", getNAV1TO);
+  fgTie("/radios/nav1/from-flag", getNAV1FROM);
+  fgTie("/radios/nav1/in-range", getNAV1InRange);
+  fgTie("/radios/nav1/dme/in-range", getNAV1DMEInRange);
 			       
-  current_properties.tieDouble("/radios/nav2/frequencies/selected",
-			       getNAV2Freq, setNAV2Freq);
-  current_properties.tieDouble("/radios/nav2/frequencies/standby",
-			       getNAV2AltFreq, setNAV2AltFreq);
-  current_properties.tieDouble("/radios/nav2/radials/actual",
-			       getNAV2Radial, 0);
-  current_properties.tieDouble("/radios/nav2/radials/selected",
-			       getNAV2SelRadial, setNAV2SelRadial);
-  current_properties.tieDouble("/radios/nav2/dme/distance",
-			       getNAV2DistDME, 0);
-  current_properties.tieBool("/radios/nav2/in-range",
-			     getNAV2InRange, 0);
-  current_properties.tieBool("/radios/nav2/dme/in-range",
-			     getNAV2DMEInRange, 0);
-
-  current_properties.tieDouble("/radios/adf/frequencies/selected",
-			       getADFFreq, setADFFreq);
-  current_properties.tieDouble("/radios/adf/frequencies/standby",
-			       getADFAltFreq, setADFAltFreq);
-  current_properties.tieDouble("/radios/adf/rotation",
-			       getADFRotation, setADFRotation);
+  fgTie("/radios/nav2/frequencies/selected", getNAV2Freq, setNAV2Freq);
+  fgTie("/radios/nav2/frequencies/standby",
+             getNAV2AltFreq, setNAV2AltFreq);
+  fgTie("/radios/nav2/radials/actual", getNAV2Radial);
+  fgTie("/radios/nav2/radials/selected",
+             getNAV2SelRadial, setNAV2SelRadial);
+  fgTie("/radios/nav2/dme/distance", getNAV2DistDME);
+  fgTie("/radios/nav2/to-flag", getNAV2TO);
+  fgTie("/radios/nav2/from-flag", getNAV2FROM);
+  fgTie("/radios/nav2/in-range", getNAV2InRange);
+  fgTie("/radios/nav2/dme/in-range", getNAV2DMEInRange);
+
+  fgTie("/radios/adf/frequencies/selected", getADFFreq, setADFFreq);
+  fgTie("/radios/adf/frequencies/standby", getADFAltFreq, setADFAltFreq);
+  fgTie("/radios/adf/rotation", getADFRotation, setADFRotation);
+
+				// Weather
+  fgTie("/environment/visibility", getVisibility, setVisibility);
+  fgTie("/environment/wind-north", getWindNorth, setWindNorth);
+  fgTie("/environment/wind-east", getWindEast, setWindEast);
+  fgTie("/environment/wind-down", getWindDown, setWindDown);
+
+				// View
+  fgTie("/sim/view/axes/long", (double(*)())0, setViewAxisLong);
+  fgTie("/sim/view/axes/lat", (double(*)())0, setViewAxisLat);
+
+  _altitude_countdown = 0;
+  _needReinit = false;
 
   FG_LOG(FG_GENERAL, FG_INFO, "Ending BFI init");
 }
@@ -214,90 +341,15 @@ FGBFI::init ()
 void
 FGBFI::update ()
 {
+  _check_altitude();
+  _check_lighting();
+  _set_view_from_axes();
   if (_needReinit) {
     reinit();
   }
 }
 
 
-/**
- * Reinitialize FGFS to use the new BFI settings.
- */
-void
-FGBFI::reinit ()
-{
-				// Save the state of everything
-				// that's going to get clobbered
-				// when we reinit the subsystems.
-
-  cout << "BFI: start reinit\n";
-
-  setHeading(getHeading());
-  setPitch(getPitch());
-  setRoll(getRoll());
-  setSpeedNorth(getSpeedNorth());
-  setSpeedEast(getSpeedEast());
-  setSpeedDown(getSpeedDown());
-  setLatitude(getLatitude());
-  setLongitude(getLongitude());
-  setAltitude(getAltitude());
-
-				// TODO: add more AP stuff
-  double elevator = getElevator();
-  double aileron = getAileron();
-  double rudder = getRudder();
-  double throttle = getThrottle();
-  double elevator_trim = getElevatorTrim();
-  double flaps = getFlaps();
-  double brake = getBrake();
-  bool apHeadingLock = getAPHeadingLock();
-  double apHeadingMag = getAPHeadingMag();
-  bool apAltitudeLock = getAPAltitudeLock();
-  double apAltitude = getAPAltitude();
-  const string &targetAirport = getTargetAirport();
-  bool gpsLock = getGPSLock();
-  double gpsLatitude = getGPSTargetLatitude();
-  double gpsLongitude = getGPSTargetLongitude();
-
-  setTargetAirport("");
-  cout << "Target airport is " << current_options.get_airport_id() << endl;
-
-  fgReInitSubsystems();
-
-				// FIXME: this is wrong.
-				// All of these are scheduled events,
-				// and it should be possible to force
-				// them all to run once.
-  fgUpdateSunPos();
-  fgUpdateMoonPos();
-  cur_light_params.Update();
-  fgUpdateLocalTime();
-  fgUpdateWeatherDatabase();
-  fgRadioSearch();
-
-				// Restore all of the old states.
-  setElevator(elevator);
-  setAileron(aileron);
-  setRudder(rudder);
-  setThrottle(throttle);
-  setElevatorTrim(elevator_trim);
-  setFlaps(flaps);
-  setBrake(brake);
-  setAPHeadingLock(apHeadingLock);
-  setAPHeadingMag(apHeadingMag);
-  setAPAltitudeLock(apAltitudeLock);
-  setAPAltitude(apAltitude);
-  setTargetAirport(targetAirport);
-  setGPSLock(gpsLock);
-  setGPSTargetLatitude(gpsLatitude);
-  setGPSTargetLongitude(gpsLongitude);
-
-  _needReinit = false;
-
-  cout << "BFI: end reinit\n";
-}
-
-
 
 ////////////////////////////////////////////////////////////////////////
 // Simulation.
@@ -312,27 +364,29 @@ FGBFI::reinit ()
 int
 FGBFI::getFlightModel ()
 {
-  return current_options.get_flight_model();
+  return globals->get_options()->get_flight_model();
 }
 
 
 /**
  * Return the current aircraft as a string.
  */
-const string
+string
 FGBFI::getAircraft ()
 {
-  return current_options.get_aircraft();
+  _temp = globals->get_options()->get_aircraft();
+  return _temp;
 }
 
 
 /**
  * Return the current aircraft directory (UIUC) as a string.
  */
-const string
+string 
 FGBFI::getAircraftDir ()
 {
-  return aircraft_dir;
+  _temp = aircraft_dir;
+  return _temp;
 }
 
 
@@ -344,8 +398,10 @@ FGBFI::getAircraftDir ()
 void
 FGBFI::setFlightModel (int model)
 {
-  current_options.set_flight_model(model);
-  needReinit();
+  if (getFlightModel() != model) {
+    globals->get_options()->set_flight_model(model);
+    needReinit();
+  }
 }
 
 
@@ -353,10 +409,12 @@ FGBFI::setFlightModel (int model)
  * Set the current aircraft.
  */
 void
-FGBFI::setAircraft (const string &aircraft)
+FGBFI::setAircraft (string aircraft)
 {
-  current_options.set_aircraft(aircraft);
-  needReinit();
+  if (getAircraft() != aircraft) {
+    globals->get_options()->set_aircraft(aircraft);
+    needReinit();
+  }
 }
 
 
@@ -364,20 +422,29 @@ FGBFI::setAircraft (const string &aircraft)
  * Set the current aircraft directory (UIUC).
  */
 void
-FGBFI::setAircraftDir (const string &dir)
+FGBFI::setAircraftDir (string dir)
 {
-  aircraft_dir = dir;
-  needReinit();
+  if (getAircraftDir() != dir) {
+    aircraft_dir = dir;
+    needReinit();
+  }
 }
 
 
 /**
  * Return the current Zulu time.
  */
-time_t
-FGBFI::getTimeGMT ()
+string 
+FGBFI::getDateString ()
 {
-  return SGTime::cur_time_params->get_cur_time();
+  string out;
+  char buf[64];
+  struct tm * t = globals->get_time_params()->getGmt();
+  sprintf(buf, "%.4d-%.2d-%.2dT%.2d:%.2d:%.2d",
+	  t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
+	  t->tm_hour, t->tm_min, t->tm_sec);
+  out = buf;
+  return out;
 }
 
 
@@ -385,22 +452,62 @@ FGBFI::getTimeGMT ()
  * Set the current Zulu time.
  */
 void
-FGBFI::setTimeGMT (time_t time)
+FGBFI::setDateString (string date_string)
+// FGBFI::setTimeGMT (time_t time)
+{
+  SGTime * st = globals->get_time_params();
+  struct tm * current_time = st->getGmt();
+  struct tm new_time;
+
+				// Scan for basic ISO format
+				// YYYY-MM-DDTHH:MM:SS
+  int ret = sscanf(date_string.c_str(), "%d-%d-%dT%d:%d:%d",
+		   &(new_time.tm_year), &(new_time.tm_mon),
+		   &(new_time.tm_mday), &(new_time.tm_hour),
+		   &(new_time.tm_min), &(new_time.tm_sec));
+
+				// Be pretty picky about this, so
+				// that strange things don't happen
+				// if the save file has been edited
+				// by hand.
+  if (ret != 6) {
+    FG_LOG(FG_INPUT, FG_ALERT, "Date/time string " << date_string
+	   << " not in YYYY-MM-DDTHH:MM:SS format; skipped");
+    return;
+  }
+
+				// OK, it looks like we got six
+				// values, one way or another.
+  new_time.tm_year -= 1900;
+  new_time.tm_mon -= 1;
+
+				// Now, tell flight gear to use
+				// the new time.  This was far
+				// too difficult, by the way.
+  long int warp =
+    mktime(&new_time) - mktime(current_time) + globals->get_warp();
+  double lon = current_aircraft.fdm_state->get_Longitude();
+  double lat = current_aircraft.fdm_state->get_Latitude();
+  double alt = current_aircraft.fdm_state->get_Altitude() * FEET_TO_METER;
+  globals->set_warp(warp);
+  st->update(lon, lat, warp);
+  fgUpdateSkyAndLightingParams();
+}
+
+
+/**
+ * Return the GMT as a string.
+ */
+string 
+FGBFI::getGMTString ()
 {
-				// FIXME: need to update lighting
-				// and solar system
-  current_options.set_time_offset(time);
-  current_options.set_time_offset_type(SG_TIME_GMT_ABSOLUTE);
-  SGTime::cur_time_params->init( cur_fdm_state->get_Longitude(),
-				 cur_fdm_state->get_Latitude(),
-				 current_options.get_fg_root(),
-				 current_options.get_time_offset(),
-				 current_options.get_time_offset_type() );
-  SGTime::cur_time_params->update( cur_fdm_state->get_Longitude(),
-				   cur_fdm_state->get_Latitude(),
-				   cur_fdm_state->get_Altitude()
-				   * FEET_TO_METER );
-  needReinit();
+  string out;
+  char buf[16];
+  struct tm * t = globals->get_time_params()->getGmt();
+  sprintf(buf, " %.2d:%.2d:%.2d",
+	  t->tm_hour, t->tm_min, t->tm_sec);
+  out = buf;
+  return out;
 }
 
 
@@ -410,7 +517,7 @@ FGBFI::setTimeGMT (time_t time)
 bool
 FGBFI::getHUDVisible ()
 {
-  return current_options.get_hud_status();
+  return globals->get_options()->get_hud_status();
 }
 
 
@@ -420,7 +527,7 @@ FGBFI::getHUDVisible ()
 void
 FGBFI::setHUDVisible (bool visible)
 {
-  current_options.set_hud_status(visible);
+  globals->get_options()->set_hud_status(visible);
 }
 
 
@@ -430,7 +537,7 @@ FGBFI::setHUDVisible (bool visible)
 bool
 FGBFI::getPanelVisible ()
 {
-  return current_options.get_panel_status();
+  return globals->get_options()->get_panel_status();
 }
 
 
@@ -440,12 +547,62 @@ FGBFI::getPanelVisible ()
 void
 FGBFI::setPanelVisible (bool visible)
 {
-  if (current_options.get_panel_status() != visible) {
-    current_options.toggle_panel();
+  if (globals->get_options()->get_panel_status() != visible) {
+    globals->get_options()->toggle_panel();
   }
 }
 
 
+/**
+ * Get the panel's current x-shift.
+ */
+int
+FGBFI::getPanelXOffset ()
+{
+  if (current_panel != 0)
+    return current_panel->getXOffset();
+  else
+    return 0;
+}
+
+
+/**
+ * Set the panel's current x-shift.
+ */
+void
+FGBFI::setPanelXOffset (int offset)
+{
+  if (current_panel != 0)
+    current_panel->setXOffset(offset);
+}
+
+
+/**
+ * Get the panel's current y-shift.
+ */
+int
+FGBFI::getPanelYOffset ()
+{
+  if (current_panel != 0)
+    return current_panel->getYOffset();
+  else
+    return 0;
+}
+
+
+/**
+ * Set the panel's current y-shift.
+ */
+void
+FGBFI::setPanelYOffset (int offset)
+{
+  if (current_panel != 0)
+    current_panel->setYOffset(offset);
+}
+
+
+
+
 
 ////////////////////////////////////////////////////////////////////////
 // Position
@@ -468,9 +625,10 @@ FGBFI::getLatitude ()
 void
 FGBFI::setLatitude (double latitude)
 {
-  current_options.set_lat(latitude);
   current_aircraft.fdm_state->set_Latitude(latitude * DEG_TO_RAD);
-  needReinit();
+  fgUpdateSkyAndLightingParams();
+  if (_lighting_countdown <= 0)
+    _lighting_countdown = 5;
 }
 
 
@@ -490,9 +648,10 @@ FGBFI::getLongitude ()
 void
 FGBFI::setLongitude (double longitude)
 {
-  current_options.set_lon(longitude);
   current_aircraft.fdm_state->set_Longitude(longitude * DEG_TO_RAD);
-  needReinit();
+  fgUpdateSkyAndLightingParams();
+  if (_lighting_countdown <= 0)
+    _lighting_countdown = 5;
 }
 
 
@@ -514,7 +673,7 @@ double
 FGBFI::getAGL ()
 {
   return current_aircraft.fdm_state->get_Altitude()
-	 - scenery.cur_elev * METER_TO_FEET;
+	 - (scenery.cur_elev * METER_TO_FEET);
 }
 
 
@@ -524,10 +683,23 @@ FGBFI::getAGL ()
 void
 FGBFI::setAltitude (double altitude)
 {
-  fgFDMForceAltitude(getFlightModel(), altitude * FEET_TO_METER);
-//   current_options.set_altitude(altitude * FEET_TO_METER);
-//   current_aircraft.fdm_state->set_Altitude(altitude);
-//   needReinit();
+  current_aircraft.fdm_state->set_Altitude(altitude);
+
+				// 2000-12-07
+				// This is an ugly kludge around a
+				// LaRCsim problem; if the
+				// requested altitude cannot be
+				// set right away (because it's
+				// below the last-calculated ground
+				// level), pause FGFS, wait for
+				// five frames, and then try again.
+  if (_altitude_countdown <= 0 &&
+      fabs(getAltitude() - altitude) > 5.0) {
+    _altitude_countdown = 5;
+    _requested_altitude = altitude;
+    _saved_freeze = globals->get_freeze();
+    globals->set_freeze(true);
+  }
 }
 
 
@@ -563,11 +735,9 @@ FGBFI::getHeadingMag ()
 void
 FGBFI::setHeading (double heading)
 {
-  current_options.set_heading(heading);
-  current_aircraft.fdm_state->set_Euler_Angles(getRoll() * DEG_TO_RAD,
-					       getPitch() * DEG_TO_RAD,
-					       heading * DEG_TO_RAD);
-  needReinit();
+  FGInterface * fdm = current_aircraft.fdm_state;
+  fdm->set_Euler_Angles(fdm->get_Phi(), fdm->get_Theta(),
+			heading * DEG_TO_RAD);
 }
 
 
@@ -587,12 +757,8 @@ FGBFI::getPitch ()
 void
 FGBFI::setPitch (double pitch)
 {
-
-  current_options.set_pitch(pitch);
-  current_aircraft.fdm_state->set_Euler_Angles(getRoll() * DEG_TO_RAD,
-					       pitch * DEG_TO_RAD,
-					       getHeading() * DEG_TO_RAD);
-  needReinit();
+  FGInterface * fdm = current_aircraft.fdm_state;
+  fdm->set_Euler_Angles(fdm->get_Phi(), pitch * DEG_TO_RAD, fdm->get_Psi());
 }
 
 
@@ -612,11 +778,78 @@ FGBFI::getRoll ()
 void
 FGBFI::setRoll (double roll)
 {
-  current_options.set_roll(roll);
-  current_aircraft.fdm_state->set_Euler_Angles(roll * DEG_TO_RAD,
-					       getPitch() * DEG_TO_RAD,
-					       getHeading() * DEG_TO_RAD);
-  needReinit();
+  FGInterface * fdm = current_aircraft.fdm_state;
+  fdm->set_Euler_Angles(roll * DEG_TO_RAD, fdm->get_Theta(), fdm->get_Psi());
+}
+
+
+/**
+ * Return the current engine0 rpm
+ */
+double
+FGBFI::getRPM ()
+{
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_RPM();
+  } else {
+      return 0.0;
+  }
+}
+
+
+/**
+ * Set the current engine0 rpm
+ */
+void
+FGBFI::setRPM (double rpm)
+{
+    if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+	if (getRPM() != rpm) {
+	    current_aircraft.fdm_state->get_engine(0)->set_RPM( rpm );
+	}
+    }
+}
+
+
+/**
+ * Return the current engine0 EGT.
+ */
+double
+FGBFI::getEGT ()
+{
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_EGT();
+  } else {
+      return 0.0;
+  }
+}
+
+
+/**
+ * Return the current engine0 CHT.
+ */
+double
+FGBFI::getCHT ()
+{
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_CHT();
+  } else {
+      return 0.0;
+  }
+}
+
+
+/**
+ * Return the current engine0 CHT.
+ */
+double
+FGBFI::getMP ()
+{
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_Manifold_Pressure();
+  } else {
+      return 0.0;
+  }
 }
 
 
@@ -637,6 +870,16 @@ FGBFI::getAirspeed ()
 }
 
 
+/**
+ * Set the calibrated airspeed in knots.
+ */
+void
+FGBFI::setAirspeed (double speed)
+{
+  current_aircraft.fdm_state->set_V_calibrated_kts(speed);
+}
+
+
 /**
  * Return the current sideslip (FIXME: units unknown).
  */
@@ -668,18 +911,15 @@ FGBFI::getSpeedNorth ()
 }
 
 
-/**
- * Set the current north velocity (units??).
- */
-void
-FGBFI::setSpeedNorth (double speed)
-{
-  current_options.set_uBody(speed);
-  current_aircraft.fdm_state->set_Velocities_Local(speed,
-						   getSpeedEast(),
-						   getSpeedDown());
-  needReinit();
-}
+// /**
+//  * Set the current north velocity (units??).
+//  */
+// void
+// FGBFI::setSpeedNorth (double speed)
+// {
+//   FGInterface * fdm = current_aircraft.fdm_state;
+// //   fdm->set_Velocities_Local(speed, fdm->get_V_east(), fdm->get_V_down());
+// }
 
 
 /**
@@ -692,18 +932,15 @@ FGBFI::getSpeedEast ()
 }
 
 
-/**
- * Set the current east velocity (units??).
- */
-void
-FGBFI::setSpeedEast (double speed)
-{
-  current_options.set_vBody(speed);
-  current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
-						   speed,
-						   getSpeedDown());
-  needReinit();
-}
+// /**
+//  * Set the current east velocity (units??).
+//  */
+// void
+// FGBFI::setSpeedEast (double speed)
+// {
+//   FGInterface * fdm = current_aircraft.fdm_state;
+// //   fdm->set_Velocities_Local(fdm->get_V_north(), speed, fdm->get_V_down());
+// }
 
 
 /**
@@ -716,18 +953,15 @@ FGBFI::getSpeedDown ()
 }
 
 
-/**
- * Set the current down velocity (units??).
- */
-void
-FGBFI::setSpeedDown (double speed)
-{
-  current_options.set_wBody(speed);
-  current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
-						   getSpeedEast(),
-						   speed);
-  needReinit();
-}
+// /**
+//  * Set the current down velocity (units??).
+//  */
+// void
+// FGBFI::setSpeedDown (double speed)
+// {
+//   FGInterface * fdm = current_aircraft.fdm_state;
+// //   fdm->set_Velocities_Local(fdm->get_V_north(), fdm->get_V_east(), speed);
+// }
 
 
 
@@ -742,7 +976,7 @@ FGBFI::setSpeedDown (double speed)
 double
 FGBFI::getThrottle ()
 {
-				// FIXME: add throttle selector
+				// FIXME: add engine selector
   return controls.get_throttle(0);
 }
 
@@ -753,12 +987,55 @@ FGBFI::getThrottle ()
 void
 FGBFI::setThrottle (double throttle)
 {
-				// FIXME: allow throttle selection
-				// FIXME: clamp?
+				// FIXME: allow engine selection
   controls.set_throttle(0, throttle);
 }
 
 
+/**
+ * Get the fuel mixture setting, from 0.0 (none) to 1.0 (full).
+ */
+double
+FGBFI::getMixture ()
+{
+				// FIXME: add engine selector
+  return controls.get_mixture(0);
+}
+
+
+/**
+ * Set the fuel mixture, from 0.0 (none) to 1.0 (full).
+ */
+void
+FGBFI::setMixture (double mixture)
+{
+				// FIXME: allow engine selection
+  controls.set_mixture(0, mixture);
+}
+
+
+/**
+ * Get the propellor pitch setting, from 0.0 (none) to 1.0 (full).
+ */
+double
+FGBFI::getPropAdvance ()
+{
+				// FIXME: add engine selector
+  return controls.get_prop_advance(0);
+}
+
+
+/**
+ * Set the propellor pitch, from 0.0 (none) to 1.0 (full).
+ */
+void
+FGBFI::setPropAdvance (double pitch)
+{
+				// FIXME: allow engine selection
+  controls.set_prop_advance(0, pitch);
+}
+
+
 /**
  * Get the flaps setting, from 0.0 (none) to 1.0 (full).
  */
@@ -865,28 +1142,92 @@ FGBFI::setElevatorTrim (double trim)
 
 
 /**
- * Get the brake setting, from 0.0 (none) to 1.0 (full).
+ * Get the highest brake setting, from 0.0 (none) to 1.0 (full).
+ */
+double
+FGBFI::getBrakes ()
+{
+  double b1 = getCenterBrake();
+  double b2 = getLeftBrake();
+  double b3 = getRightBrake();
+  return (b1 > b2 ? (b1 > b3 ? b1 : b3) : (b2 > b3 ? b2 : b3));
+}
+
+
+/**
+ * Set all brakes, from 0.0 (none) to 1.0 (full).
+ */
+void
+FGBFI::setBrakes (double brake)
+{
+  setCenterBrake(brake);
+  setLeftBrake(brake);
+  setRightBrake(brake);
+}
+
+
+/**
+ * Get the center brake, from 0.0 (none) to 1.0 (full).
  */
 double
-FGBFI::getBrake ()
+FGBFI::getCenterBrake ()
+{
+  return controls.get_brake(2);
+}
+
+
+/**
+ * Set the center brake, from 0.0 (none) to 1.0 (full).
+ */
+void
+FGBFI::setCenterBrake (double brake)
+{
+  controls.set_brake(2, brake);
+}
+
+
+/**
+ * Get the left brake, from 0.0 (none) to 1.0 (full).
+ */
+double
+FGBFI::getLeftBrake ()
 {
-				// FIXME: add brake selector
   return controls.get_brake(0);
 }
 
 
 /**
- * Set the brake, from 0.0 (none) to 1.0 (full).
+ * Set the left brake, from 0.0 (none) to 1.0 (full).
  */
 void
-FGBFI::setBrake (double brake)
+FGBFI::setLeftBrake (double brake)
 {
-				// FIXME: clamp?
-				// FIXME: allow brake selection
   controls.set_brake(0, brake);
 }
 
 
+/**
+ * Get the right brake, from 0.0 (none) to 1.0 (full).
+ */
+double
+FGBFI::getRightBrake ()
+{
+  return controls.get_brake(1);
+}
+
+
+/**
+ * Set the right brake, from 0.0 (none) to 1.0 (full).
+ */
+void
+FGBFI::setRightBrake (double brake)
+{
+  controls.set_brake(1, brake);
+}
+
+
+
+
 
 ////////////////////////////////////////////////////////////////////////
 // Autopilot
@@ -968,6 +1309,26 @@ FGBFI::setAPHeadingLock (bool lock)
 }
 
 
+/**
+ * Get the autopilot target heading in degrees.
+ */
+double
+FGBFI::getAPHeading ()
+{
+  return current_autopilot->get_TargetHeading();
+}
+
+
+/**
+ * Set the autopilot target heading in degrees.
+ */
+void
+FGBFI::setAPHeading (double heading)
+{
+  current_autopilot->set_TargetHeading( heading );
+}
+
+
 /**
  * Get the autopilot target heading in degrees.
  */
@@ -1051,6 +1412,48 @@ FGBFI::getNAV1DistDME ()
   return current_radiostack->get_nav1_dme_dist();
 }
 
+bool 
+FGBFI::getNAV1TO ()
+{
+  if (current_radiostack->get_nav1_inrange()) {
+    double heading = current_radiostack->get_nav1_heading();
+    double radial = current_radiostack->get_nav1_radial();
+//     double var = FGBFI::getMagVar();
+    if (current_radiostack->get_nav1_loc()) {
+      double offset = fabs(heading - radial);
+      return (offset<= 8.0 || offset >= 352.0);
+    } else {
+//       double offset =
+// 	fabs(heading - var - radial);
+      double offset = fabs(heading - radial);
+      return (offset <= 20.0 || offset >= 340.0);
+    }
+  } else {
+    return false;
+  }
+}
+
+bool
+FGBFI::getNAV1FROM ()
+{
+  if (current_radiostack->get_nav1_inrange()) {
+    double heading = current_radiostack->get_nav1_heading();
+    double radial = current_radiostack->get_nav1_radial();
+//     double var = FGBFI::getMagVar();
+    if (current_radiostack->get_nav1_loc()) {
+      double offset = fabs(heading - radial);
+      return (offset >= 172.0 && offset<= 188.0);
+    } else {
+//       double offset =
+// 	fabs(heading - var - radial);
+      double offset = fabs(heading - radial);
+      return (offset >= 160.0 && offset <= 200.0);
+    }
+  } else {
+    return false;
+  }
+}
+
 bool
 FGBFI::getNAV1InRange ()
 {
@@ -1094,6 +1497,49 @@ FGBFI::getNAV2DistDME ()
   return current_radiostack->get_nav2_dme_dist();
 }
 
+bool 
+FGBFI::getNAV2TO ()
+{
+  if (current_radiostack->get_nav2_inrange()) {
+    double heading = current_radiostack->get_nav2_heading();
+    double radial = current_radiostack->get_nav2_radial();
+//     double var = FGBFI::getMagVar();
+    if (current_radiostack->get_nav2_loc()) {
+      double offset = fabs(heading - radial);
+      return (offset<= 8.0 || offset >= 352.0);
+    } else {
+//       double offset =
+// 	fabs(heading - var - radial);
+      double offset = fabs(heading - radial);
+      return (offset <= 20.0 || offset >= 340.0);
+    }
+  } else {
+    return false;
+  }
+}
+
+bool 
+FGBFI::getNAV2FROM ()
+{
+  if (current_radiostack->get_nav2_inrange()) {
+    double heading = current_radiostack->get_nav2_heading();
+    double radial = current_radiostack->get_nav2_radial();
+//     double var = FGBFI::getMagVar();
+    if (current_radiostack->get_nav2_loc()) {
+      double offset = fabs(heading - radial);
+      return (offset >= 172.0 && offset<= 188.0);
+    } else {
+//       double offset =
+// 	fabs(heading - var - radial);
+      double offset = fabs(heading - radial);
+      return (offset >= 160.0 && offset <= 200.0);
+    }
+  } else {
+    return false;
+  }
+}
+
+
 bool
 FGBFI::getNAV2InRange ()
 {
@@ -1217,10 +1663,14 @@ FGBFI::setGPSLock (bool lock)
 /**
  * Get the GPS target airport code.
  */
-const string
+string 
 FGBFI::getTargetAirport ()
 {
-  return current_options.get_airport_id();
+  // FIXME: not thread-safe
+  static string out;
+  out = globals->get_options()->get_airport_id();
+
+  return out;
 }
 
 
@@ -1228,9 +1678,9 @@ FGBFI::getTargetAirport ()
  * Set the GPS target airport code.
  */
 void
-FGBFI::setTargetAirport (const string &airportId)
+FGBFI::setTargetAirport (string airportId)
 {
-  current_options.set_airport_id(airportId);
+  globals->get_options()->set_airport_id(airportId);
 }
 
 
@@ -1244,16 +1694,6 @@ FGBFI::getGPSTargetLatitude ()
 }
 
 
-/**
- * Set the GPS target latitude in degrees (negative for south).
- */
-void
-FGBFI::setGPSTargetLatitude (double latitude)
-{
-  current_autopilot->set_TargetLatitude( latitude );
-}
-
-
 /**
  * Get the GPS target longitude in degrees (negative for west).
  */
@@ -1263,7 +1703,7 @@ FGBFI::getGPSTargetLongitude ()
   return current_autopilot->get_TargetLongitude();
 }
 
-
+#if 0
 /**
  * Set the GPS target longitude in degrees (negative for west).
  */
@@ -1272,6 +1712,7 @@ FGBFI::setGPSTargetLongitude (double longitude)
 {
   current_autopilot->set_TargetLongitude( longitude );
 }
+#endif
 
 
 
@@ -1281,7 +1722,7 @@ FGBFI::setGPSTargetLongitude (double longitude)
 
 
 /**
- * Get the current visible (units??).
+ * Get the current visibility (meters).
  */
 double
 FGBFI::getVisibility ()
@@ -1295,62 +1736,103 @@ FGBFI::getVisibility ()
 
 
 /**
- * Check whether clouds are enabled.
+ * Set the current visibility (meters).
  */
-bool
-FGBFI::getClouds ()
+void
+FGBFI::setVisibility (double visibility)
 {
-  return current_options.get_clouds();
+#ifndef FG_OLD_WEATHER
+  WeatherDatabase->setWeatherVisibility(visibility);
+#else
+  current_weather.set_visibility(visibility);
+#endif
 }
 
 
 /**
- * Check the height of the clouds ASL (units?).
+ * Get the current wind north velocity (feet/second).
  */
 double
-FGBFI::getCloudsASL ()
+FGBFI::getWindNorth ()
 {
-  return current_options.get_clouds_asl();
+  return current_aircraft.fdm_state->get_V_north_airmass();
 }
 
 
 /**
- * Set the current visibility (units??).
+ * Set the current wind north velocity (feet/second).
  */
 void
-FGBFI::setVisibility (double visibility)
+FGBFI::setWindNorth (double speed)
 {
-#ifndef FG_OLD_WEATHER
-  WeatherDatabase->setWeatherVisibility(visibility);
-#else
-  current_weather.set_visibility(visibility);
-#endif
+  current_aircraft.fdm_state->set_Velocities_Local_Airmass(speed,
+							   getWindEast(),
+							   getWindDown());
 }
 
 
 /**
- * Switch clouds on or off.
+ * Get the current wind east velocity (feet/second).
+ */
+double
+FGBFI::getWindEast ()
+{
+  return current_aircraft.fdm_state->get_V_east_airmass();
+}
+
+
+/**
+ * Set the current wind east velocity (feet/second).
  */
 void
-FGBFI::setClouds (bool clouds)
+FGBFI::setWindEast (double speed)
 {
-  cout << "Set clouds to " << clouds << endl;
-  current_options.set_clouds(clouds);
-  needReinit();
+  cout << "Set wind-east to " << speed << endl;
+  current_aircraft.fdm_state->set_Velocities_Local_Airmass(getWindNorth(),
+							   speed,
+							   getWindDown());
 }
 
 
 /**
- * Set the cloud height.
+ * Get the current wind down velocity (feet/second).
+ */
+double
+FGBFI::getWindDown ()
+{
+  return current_aircraft.fdm_state->get_V_down_airmass();
+}
+
+
+/**
+ * Set the current wind down velocity (feet/second).
  */
 void
-FGBFI::setCloudsASL (double cloudsASL)
+FGBFI::setWindDown (double speed)
 {
-  current_options.set_clouds_asl(cloudsASL);
-  needReinit();
+  current_aircraft.fdm_state->set_Velocities_Local_Airmass(getWindNorth(),
+							   getWindEast(),
+							   speed);
 }
 
 
+
+////////////////////////////////////////////////////////////////////////
+// View.
+////////////////////////////////////////////////////////////////////////
+
+void
+FGBFI::setViewAxisLong (double axis)
+{
+  axisLong = axis;
+}
+
+void
+FGBFI::setViewAxisLat (double axis)
+{
+  axisLat = axis;
+}
+
 
 ////////////////////////////////////////////////////////////////////////
 // Time
@@ -1362,7 +1844,7 @@ FGBFI::setCloudsASL (double cloudsASL)
 double
 FGBFI::getMagVar ()
 {
-  return cur_magvar.get_magvar() * RAD_TO_DEG;
+  return globals->get_mag()->get_magvar() * RAD_TO_DEG;
 }
 
 
@@ -1372,7 +1854,7 @@ FGBFI::getMagVar ()
 double
 FGBFI::getMagDip ()
 {
-  return cur_magvar.get_magdip() * RAD_TO_DEG;
+  return globals->get_mag()->get_magdip() * RAD_TO_DEG;
 }