Cascading changes from the navcom.[ch]xx addition.

diff --git a/src/Autopilot/newauto.cxx b/src/Autopilot/newauto.cxx
index f99c4412f23c8539dab88498ab32cafa6a131494..e39e7ee8c863942c8fdadd3e0c1bcd536b80e612 100644 (file)
--- a/src/Autopilot/newauto.cxx
+++ b/src/Autopilot/newauto.cxx
@@ -503,37 +503,37 @@ FGAutopilot::update (double dt)
 
            // determine our current radial position relative to the
            // navaid in "true" heading.
-           double cur_radial = current_radiostack->get_nav1_heading();
-           if ( current_radiostack->get_nav1_loc() ) {
+           double cur_radial = current_radiostack->get_navcom1()->get_nav_heading();
+           if ( current_radiostack->get_navcom1()->get_nav_loc() ) {
                // ILS localizers radials are already "true" in our
                // database
            } else {
-               cur_radial += current_radiostack->get_nav1_magvar();
+               cur_radial += current_radiostack->get_navcom1()->get_nav_magvar();
            }
-           if ( current_radiostack->get_nav1_from_flag() ) {
+           if ( current_radiostack->get_navcom1()->get_nav_from_flag() ) {
                cur_radial += 180.0;
                while ( cur_radial >= 360.0 ) { cur_radial -= 360.0; }
            }
 
            // determine the target radial in "true" heading
-           double tgt_radial = current_radiostack->get_nav1_radial();
-           if ( current_radiostack->get_nav1_loc() ) {
+           double tgt_radial = current_radiostack->get_navcom1()->get_nav_radial();
+           if ( current_radiostack->get_navcom1()->get_nav_loc() ) {
                // ILS localizers radials are already "true" in our
                // database
            } else {
                // VOR radials need to have that vor's offset added in
-               tgt_radial += current_radiostack->get_nav1_magvar();
+               tgt_radial += current_radiostack->get_navcom1()->get_nav_magvar();
            }
 
            // determine the heading adjustment needed.
            double adjustment = 
-               current_radiostack->get_nav1_heading_needle_deflection()
-               * (current_radiostack->get_nav1_loc_dist() * SG_METER_TO_NM);
+               current_radiostack->get_navcom1()->get_nav_heading_needle_deflection()
+               * (current_radiostack->get_navcom1()->get_nav_loc_dist() * SG_METER_TO_NM);
            SG_CLAMP_RANGE( adjustment, -30.0, 30.0 );
 
             // clamp closer when inside cone when beyond 5km...
-            if (current_radiostack->get_nav1_loc_dist() > 5000) {
-              double clamp_angle = fabs(current_radiostack->get_nav1_heading_needle_deflection()) * 3;
+            if (current_radiostack->get_navcom1()->get_nav_loc_dist() > 5000) {
+              double clamp_angle = fabs(current_radiostack->get_navcom1()->get_nav_heading_needle_deflection()) * 3;
               if (clamp_angle < 30)
                 SG_CLAMP_RANGE( adjustment, -clamp_angle, clamp_angle);
             }
@@ -696,12 +696,12 @@ FGAutopilot::update (double dt)
                ( TargetAltitude -
                  globals->get_steam()->get_ALT_ft() * SG_FEET_TO_METER ) * 8.0;
        } else if ( altitude_mode == FG_ALTITUDE_GS1 ) {
-           double x = current_radiostack->get_nav1_gs_dist();
+           double x = current_radiostack->get_navcom1()->get_nav_gs_dist();
            double y = (altitude_node->getDoubleValue()
-                       - current_radiostack->get_nav1_elev()) * SG_FEET_TO_METER;
+                       - current_radiostack->get_navcom1()->get_nav_elev()) * SG_FEET_TO_METER;
            double current_angle = atan2( y, x ) * SGD_RADIANS_TO_DEGREES;
 
-           double target_angle = current_radiostack->get_nav1_target_gs();
+           double target_angle = current_radiostack->get_navcom1()->get_nav_target_gs();
 
            double gs_diff = target_angle - current_angle;
 

diff --git a/src/Network/atlas.cxx b/src/Network/atlas.cxx
index f9dd90e7046f51eeeb848aa1ebe1007a5e95b1d7..6e7b63de08bff39df470081030df27783272ffee 100644 (file)
--- a/src/Network/atlas.cxx
+++ b/src/Network/atlas.cxx
@@ -129,10 +129,10 @@ bool FGAtlas::gen_message() {
     sprintf( gga_sum, "%02X", calc_atlas_cksum(gga) );
 
     sprintf( patla, "PATLA,%.2f,%.1f,%.2f,%.1f,%.0f",
-            current_radiostack->get_nav1_freq(),
-            current_radiostack->get_nav1_sel_radial(),
-            current_radiostack->get_nav2_freq(),
-            current_radiostack->get_nav2_sel_radial(),
+            current_radiostack->get_navcom1()->get_nav_freq(),
+            current_radiostack->get_navcom1()->get_nav_sel_radial(),
+            current_radiostack->get_navcom1()->get_nav_freq(),
+            current_radiostack->get_navcom1()->get_nav_sel_radial(),
             adf_freq->getDoubleValue() );
     sprintf( patla_sum, "%02X", calc_atlas_cksum(patla) );