Expose the "play-audio-command" through the props/telnet interface.

[flightgear.git] / src / Network / native_fdm.cxx

diff --git a/src/Network/native_fdm.cxx b/src/Network/native_fdm.cxx
index 88f0ff4940aa537c06515b65953f476501ee82dd..88ac0ffa9cd9236f0a8c49da0d06017d8d064b05 100644 (file)
--- a/src/Network/native_fdm.cxx
+++ b/src/Network/native_fdm.cxx
@@ -250,7 +250,6 @@ void FGProps2NetFDM( FGNetFDM *net, bool net_byte_order ) {
         htonf(net->stall_warning);
         htonf(net->slip_deg);
 
-        net->num_engines = htonl(net->num_engines);
         for ( i = 0; i < net->num_engines; ++i ) {
             net->eng_state[i] = htonl(net->eng_state[i]);
             htonf(net->rpm[i]);
@@ -262,19 +261,20 @@ void FGProps2NetFDM( FGNetFDM *net, bool net_byte_order ) {
             htonf(net->oil_temp[i]);
             htonf(net->oil_px[i]);
         }
+        net->num_engines = htonl(net->num_engines);
 
-        net->num_tanks = htonl(net->num_tanks);
         for ( i = 0; i < net->num_tanks; ++i ) {
             htonf(net->fuel_quantity[i]);
         }
+        net->num_tanks = htonl(net->num_tanks);
 
-        net->num_wheels = htonl(net->num_wheels);
         for ( i = 0; i < net->num_wheels; ++i ) {
             net->wow[i] = htonl(net->wow[i]);
             htonf(net->gear_pos[i]);
             htonf(net->gear_steer[i]);
             htonf(net->gear_compression[i]);
         }
+        net->num_wheels = htonl(net->num_wheels);
 
         net->cur_time = htonl( net->cur_time );
         net->warp = htonl( net->warp );
@@ -330,6 +330,7 @@ void FGNetFDM2Props( FGNetFDM *net, bool net_byte_order ) {
         htonf(net->stall_warning);
         htonf(net->slip_deg);
 
+        net->num_engines = htonl(net->num_engines);
         for ( i = 0; i < net->num_engines; ++i ) {
             net->eng_state[i] = htonl(net->eng_state[i]);
             htonf(net->rpm[i]);
@@ -341,20 +342,19 @@ void FGNetFDM2Props( FGNetFDM *net, bool net_byte_order ) {
             htonf(net->oil_temp[i]);
             htonf(net->oil_px[i]);
         }
-        net->num_engines = htonl(net->num_engines);
 
+        net->num_tanks = htonl(net->num_tanks);
         for ( i = 0; i < net->num_tanks; ++i ) {
             htonf(net->fuel_quantity[i]);
         }
-        net->num_tanks = htonl(net->num_tanks);
 
+        net->num_wheels = htonl(net->num_wheels);
         for ( i = 0; i < net->num_wheels; ++i ) {
             net->wow[i] = htonl(net->wow[i]);
             htonf(net->gear_pos[i]);
             htonf(net->gear_steer[i]);
             htonf(net->gear_compression[i]);
         }
-        net->num_wheels = htonl(net->num_wheels);
 
         net->cur_time = htonl(net->cur_time);
         net->warp = ntohl(net->warp);
@@ -383,8 +383,8 @@ void FGNetFDM2Props( FGNetFDM *net, bool net_byte_order ) {
        if ( net->agl > -9000 ) {
            cur_fdm_state->_set_Altitude_AGL( net->agl * SG_METER_TO_FEET );
        } else {
-           double agl_m
-             = net->altitude - globals->get_scenery()->get_cur_elev();
+           double agl_m = net->altitude
+              - cur_fdm_state->get_Runway_altitude_m();
            cur_fdm_state->_set_Altitude_AGL( agl_m * SG_METER_TO_FEET );
        }
         cur_fdm_state->_set_Euler_Angles( net->phi,