Begin interfacing the navcom's to the electrical model.

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

diff --git a/src/Cockpit/steam.cxx b/src/Cockpit/steam.cxx
index 39583312af817cef6ced7bad010bdacc75e443ce..e5f058407abade1d0a5c475a1404cf2fe6184e70 100644 (file)
--- a/src/Cockpit/steam.cxx
+++ b/src/Cockpit/steam.cxx
@@ -54,21 +54,22 @@ static bool isTied = false;
 ////////////////////////////////////////////////////////////////////////
 
 FGSteam::FGSteam ()
-  : the_STATIC_inhg(29.92),
+  : 
     the_ALT_ft(0.0),
     the_ALT_datum_mb(1013.0),
-    the_VSI_case(29.92),
-    the_VSI_fps(0.0),
+    the_TC_rad(0.0),
+    the_TC_std(0.0),
+    the_STATIC_inhg(29.92),
     the_VACUUM_inhg(0.0),
-    the_MH_err(0.0),
+    the_VSI_fps(0.0),
+    the_VSI_case(29.92),
     the_MH_deg(0.0),
     the_MH_degps(0.0),
-    the_DG_err(0.0),
+    the_MH_err(0.0),
     the_DG_deg(0.0),
     the_DG_degps(0.0),
     the_DG_inhg(0.0),
-    the_TC_rad(0.0),
-    the_TC_std(0.0),
+    the_DG_err(0.0),
     _UpdateTimePending(1000000)
 {
 }
@@ -317,7 +318,7 @@ void FGSteam::_CatchUp()
        More subtle flaw is having it not move or a travel limit
        occasionally due to some dirt in the tube or on the ball.
        */
-       d = - current_aircraft.fdm_state->get_A_Z_pilot();
+       d = -current_aircraft.fdm_state->get_A_Z_pilot();
        if ( d < 1 ) d = 1;
        set_lowpass ( & the_TC_rad,
                current_aircraft.fdm_state->get_A_Y_pilot () / d,
@@ -493,12 +494,12 @@ void FGSteam::_CatchUp()
 
 double FGSteam::get_HackOBS1_deg () const
 {
-  return current_radiostack->get_nav1_radial(); 
+    return current_radiostack->get_navcom1()->get_nav_radial(); 
 }
 
 double FGSteam::get_HackOBS2_deg () const
 {
-    return current_radiostack->get_nav2_radial(); 
+    return current_radiostack->get_navcom2()->get_nav_radial(); 
 }