Update 'magic' for more consistant cross platform padding.

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

diff --git a/src/Network/native_ctrls.cxx b/src/Network/native_ctrls.cxx
index 5cdfcb740c9f762de7d5cbb7be2af22f96edfe8f..a1e18f0197b3e4f20876d1a39062337fc24b65d9 100644 (file)
--- a/src/Network/native_ctrls.cxx
+++ b/src/Network/native_ctrls.cxx
@@ -239,6 +239,8 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
         htond(net->flaps);
         net->flaps_power = htonl(net->flaps_power);
         net->flap_motor_ok = htonl(net->flap_motor_ok);
+
+        net->num_engines = htonl(net->num_engines);
         for ( i = 0; i < FGNetCtrls::FG_MAX_ENGINES; ++i ) {
             net->master_bat[i] = htonl(net->master_bat[i]);
             net->master_alt[i] = htonl(net->master_alt[i]);
@@ -256,11 +258,12 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
             net->oil_press_status[i] = htonl(net->oil_press_status[i]);
             net->fuel_pump_ok[i] = htonl(net->fuel_pump_ok[i]);
         }
-        net->num_engines = htonl(net->num_engines);
+
+        net->num_tanks = htonl(net->num_tanks);
         for ( i = 0; i < FGNetCtrls::FG_MAX_TANKS; ++i ) {
             net->fuel_selector[i] = htonl(net->fuel_selector[i]);
         }
-        net->num_tanks = htonl(net->num_tanks);
+
         net->cross_feed = htonl(net->cross_feed);
         htond(net->brake_left);
         htond(net->brake_right);
@@ -303,6 +306,7 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes,
         htond(net->flaps);
         net->flaps_power = htonl(net->flaps_power);
         net->flap_motor_ok = htonl(net->flap_motor_ok);
+
         net->num_engines = htonl(net->num_engines);
         for ( i = 0; i < (int)net->num_engines; ++i ) {
             net->master_bat[i] = htonl(net->master_bat[i]);
@@ -321,10 +325,12 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes,
             net->oil_press_status[i] = htonl(net->oil_press_status[i]);
             net->fuel_pump_ok[i] = htonl(net->fuel_pump_ok[i]);
         }
+
         net->num_tanks = htonl(net->num_tanks);
         for ( i = 0; i < FGNetCtrls::FG_MAX_TANKS; ++i ) {
             net->fuel_selector[i] = htonl(net->fuel_selector[i]);
         }
+
         net->cross_feed = htonl(net->cross_feed);
         htond(net->brake_left);
         htond(net->brake_right);