Patches from Tony Peden to separate property XML I/O operations into a

[flightgear.git] / src / Cockpit / steam.cxx

diff --git a/src/Cockpit/steam.cxx b/src/Cockpit/steam.cxx
index 254f17c5526410a699cf136c2a4f3e6b9e7f580b..cd78bf303259ab843f2575299c14f3eb0854a6c0 100644 (file)
--- a/src/Cockpit/steam.cxx
+++ b/src/Cockpit/steam.cxx
@@ -103,19 +103,29 @@ void FGSteam::update ( int timesteps )
     if (!isTied) {
         isTied = true;
         fgTie("/steam/airspeed-kt", FGSteam::get_ASI_kias);
+       fgSetArchivable("/steam/airspeed-kt");
         fgTie("/steam/altitude-ft", FGSteam::get_ALT_ft);
+       fgSetArchivable("/steam/altitude-ft");
         fgTie("/steam/altimeter-datum-mb",
               FGSteam::get_ALT_datum_mb, FGSteam::set_ALT_datum_mb,
               false);  /* don't modify the value */
+       fgSetArchivable("/steam/altimeter-datum-mb");
         fgTie("/steam/turn-rate", FGSteam::get_TC_std);
+       fgSetArchivable("/steam/turn-rate");
         fgTie("/steam/slip-skid", FGSteam::get_TC_rad);
+       fgSetArchivable("/steam/slip-skid");
         fgTie("/steam/vertical-speed-fpm", FGSteam::get_VSI_fps);
+       fgSetArchivable("/steam/vertical-speed-fpm");
         fgTie("/steam/gyro-compass-deg", FGSteam::get_DG_deg);
+       fgSetArchivable("/steam/gyro-compass-deg");
         fgTie("/steam/adf-deg", FGSteam::get_HackADF_deg);
+       fgSetArchivable("/steam/adf-deg");
         fgTie("/steam/gyro-compass-error-deg",
               FGSteam::get_DG_err, FGSteam::set_DG_err,
               false);  /* don't modify the value */
+       fgSetArchivable("/steam/gyro-compass-error-deg");
         fgTie("/steam/mag-compass-deg", FGSteam::get_MH_deg);
+       fgSetArchivable("/steam/mag-compass-deg");
     }
     _UpdatesPending += timesteps;
 }
@@ -265,7 +275,7 @@ void FGSteam::_CatchUp()
        AccE = current_aircraft.fdm_state->get_V_dot_east();
        AccU = current_aircraft.fdm_state->get_V_dot_down()
             - 9.81 / 0.3;
-       if ( fabs(the_TC_rad) > 0.2 )
+       if ( fabs(the_TC_rad) > 0.2 /* 2.0 */ )
        {       /* Massive sideslip jams it; it stops turning */
                the_MH_degps = 0.0;
                the_MH_err   = fgGetDouble("/orientation/heading-deg") - the_MH_deg;
@@ -316,7 +326,7 @@ void FGSteam::_CatchUp()
        scaling capability for the vacuum pump later on.
        When we have a real engine model, we can ask it.
        */
-       the_ENGINE_rpm = controls.get_throttle(0) * 26.0;
+       the_ENGINE_rpm = globals->get_controls()->get_throttle(0) * 26.0;
 
        /**************************
        First, we need to know what the static line is reporting,
@@ -484,7 +494,7 @@ double FGSteam::get_HackADF_deg () {
 
     if ( current_radiostack->get_adf_inrange() ) {
        double r = current_radiostack->get_adf_heading()
-            - fgGetDouble("orientation/heading");
+            - fgGetDouble("/orientation/heading-deg");
        last_r = r;
        // cout << "Radial = " << current_radiostack->get_adf_heading() 
        //      << "  Heading = " << FGBFI::getHeading() << endl;