Tweaks to go along with changes in SGSocket.

[flightgear.git] / src / FDM / MagicCarpet.cxx

diff --git a/src/FDM/MagicCarpet.cxx b/src/FDM/MagicCarpet.cxx
index a26a4614159dfc6b8a2891364695adabe5bc3f85..31a428aa2e42c8a38b313e87cd6b44a0f0018fe9 100644 (file)
--- a/src/FDM/MagicCarpet.cxx
+++ b/src/FDM/MagicCarpet.cxx
@@ -21,11 +21,12 @@
 // $Id$
 
 
+#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
+
 #include <Controls/controls.hxx>
 #include <Main/options.hxx>
-#include <Math/fg_geodesy.hxx>
-#include <Math/point3d.hxx>
-#include <Math/polar3d.hxx>
 
 #include "MagicCarpet.hxx"
 
@@ -51,7 +52,9 @@ int FGMagicCarpet::update( int multiloop ) {
     double dist = speed * time_step;
     double kts = speed * METER_TO_NM * 3600.0;
     set_V_equiv_kts( kts );
+    set_V_calibrated_kts( kts );
     set_V_ground_speed( kts );
+    set_Mach_number(0);
 
     // angle of turn
     double turn_rate = controls.get_aileron() * FG_PI_4; // radians/sec
@@ -59,6 +62,7 @@ int FGMagicCarpet::update( int multiloop ) {
 
     // update euler angles
     set_Euler_Angles( get_Phi(), get_Theta(), fmod(get_Psi() + turn, FG_2PI) );
+    set_Euler_Rates(0,0,0);
 
     // update (lon/lat) position
     double lat2, lon2, az2;
@@ -84,6 +88,9 @@ int FGMagicCarpet::update( int multiloop ) {
 
     set_Geocentric_Position( lat_geoc, get_Longitude(), 
                             sl_radius + get_Altitude() + climb );
+    // cout << "sea level radius (ft) = " << sl_radius << endl;
+    // cout << "(setto) sea level radius (ft) = " << get_Sea_level_radius() << endl;
+    set_Sea_level_radius( sl_radius * METER_TO_FEET);
     set_Altitude( get_Altitude() + climb );
 
     return 1;