Merge branch 'ehofman/config' into next

[flightgear.git] / src / FDM / SP / ADA.cxx

diff --git a/src/FDM/SP/ADA.cxx b/src/FDM/SP/ADA.cxx
index 11728b7bf2940b7a091249849f1aace8629d6b16..9aaa468fac9f6ee20427b18614328067595adf58 100644 (file)
--- a/src/FDM/SP/ADA.cxx
+++ b/src/FDM/SP/ADA.cxx
@@ -12,7 +12,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -26,18 +26,17 @@
 #include <simgear/io/sg_socket.hxx>
 #include <simgear/constants.h>
 
-#include <Controls/controls.hxx>
+#include <Aircraft/controls.hxx>
+#include <Scenery/scenery.hxx> //to pass ground elevation to FDM
 #include <Main/globals.hxx>
-
 #include <Main/fg_props.hxx> //to get ID of window (left/right or center)
-#include <Scenery/scenery.hxx> //to pass ground elevation to FDM
 
 #include "ADA.hxx"
 
 #define numberofbytes 472 // from FDM to visuals
 #define nbytes 8       //from visuals to FDM
 
-struct {
+static struct {
     double number_of_bytes;
     double lat_geoc;
     double lon_geoc;
@@ -112,7 +111,7 @@ struct {
 
 double view_offset; //if this zero, means center window
 
-struct {
+static struct {
        double ground_elevation;
 } visuals_to_sixdof;
 
@@ -160,12 +159,15 @@ struct {
 #define anzg sixdof_to_visuals.anzg
 
 
-FGADA::FGADA( double dt ) {
+FGADA::FGADA( double dt ) :
+    fdmsock(0)
+{
 //     set_delta_t( dt );
 }
 
 
 FGADA::~FGADA() {
+    delete fdmsock;
 }
 
 
@@ -235,7 +237,7 @@ void FGADA::update( double dt ) {
 
 // Convert from the FGInterface struct to the FGADA struct (output)
 bool FGADA::copy_to_FGADA () {
-    ground_elevation = globals->get_scenery()->get_cur_elev();
+    ground_elevation = get_Runway_altitude_m();
     return true;
 }
 
@@ -252,10 +254,6 @@ bool FGADA::copy_from_FGADA() {
 
        _set_Geocentric_Rates( Latitude_dot, Longitude_dot, Radius_dot );
     _set_Earth_position_angle( Earth_position_angle );
-    _set_sin_lat_geocentric(Lat_geocentric);
-    _set_cos_lat_geocentric(Lat_geocentric);
-    _set_sin_cos_longitude(Longitude);
-    _set_sin_cos_latitude(Latitude);
     
        // Velocities and accelerations for the pitch ladder and velocity vector
     _set_Accels_Local( U_dot_local, V_dot_local, W_dot_local );