Fixes to ILS approaches ... now takes into consideration actual GS and DME

[flightgear.git] / src / Main / main.cxx

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 3cb5be5d19e26b6f6c67429a5413099504184a4e..68535fc6dbebda37d415f8a9094726db0b38b5a6 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -76,7 +76,7 @@
 #include <Aircraft/aircraft.hxx>
 #include <Ephemeris/ephemeris.hxx>
 
-#include <Autopilot/autopilot.hxx>
+#include <Autopilot/newauto.hxx>
 #include <Cockpit/cockpit.hxx>
 #include <Cockpit/radiostack.hxx>
 #include <Cockpit/steam.hxx>
@@ -664,7 +664,7 @@ void fgUpdateTimeDepCalcs(int multi_loop, int remainder) {
 
     if ( !t->getPause() ) {
        // run Autopilot system
-       fgAPRun();
+       current_autopilot->run();
 
        // printf("updating flight model x %d\n", multi_loop);
        /* fgFDMUpdate( current_options.get_flight_model(), 
@@ -745,8 +745,8 @@ void fgUpdateTimeDepCalcs(int multi_loop, int remainder) {
     ephem->update( t, cur_fdm_state->get_Latitude() );
 
     // Update radio stack model
-    current_radiostack->update( cur_fdm_state->get_Longitude() * RAD_TO_DEG,
-                               cur_fdm_state->get_Latitude() * RAD_TO_DEG,
+    current_radiostack->update( cur_fdm_state->get_Longitude(),
+                               cur_fdm_state->get_Latitude(),
                                cur_fdm_state->get_Altitude() * FEET_TO_METER );
 }
 
@@ -1168,9 +1168,6 @@ void fgReshape( int width, int height ) {
        // the main loop, so this will now work without seg faulting
        // the system.
        current_view.UpdateViewParams(cur_view_fdm);
-       if ( current_options.get_panel_status() ) {
-           FGPanel::OurPanel->ReInit(0, 0, 1024, 768);
-       }
     }
 }