Clean up a couple bugs in the multiengine handling of the net_fdm.hxx

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

diff --git a/src/Network/native_ctrls.cxx b/src/Network/native_ctrls.cxx
index 89a4ef0bb770bb2af021aedad232447217088317..ace029444b4b5f3ce154fb3a07e06f99cf9193e0 100644 (file)
--- a/src/Network/native_ctrls.cxx
+++ b/src/Network/native_ctrls.cxx
@@ -103,6 +103,8 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
 {
     int i;
     SGPropertyNode *node;
+    SGPropertyNode *starter;
+    SGPropertyNode *fuelpump;
     SGPropertyNode *tempnode;
 
     // fill in values
@@ -121,7 +123,9 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
     for ( i = 0; i < FGNetCtrls::FG_MAX_ENGINES; ++i ) {
         // Controls
         node = fgGetNode("/controls/engines/engine", i );
-       net->throttle[i] = node->getDoubleValue( "throttle", 0.0 );
+        starter = fgGetNode("/systems/electrical/outputs/starter", i );
+        fuelpump = fgGetNode("/systems/electrical/outputs/fuel-pump", i );
+        net->throttle[i] = node->getDoubleValue( "throttle", 0.0 );
        net->mixture[i] = node->getDoubleValue( "mixture", 0.0 );
        net->prop_advance[i] = node->getDoubleValue( "propeller-pitch", 0.0 );
        net->magnetos[i] = node->getIntValue( "magnetos", 0 );
@@ -132,13 +136,18 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
          // cout << "Starter -> " << node->getIntValue( "starter", false )
          //      << endl;
        }
-       net->fuel_pump_power[i]
-            = node->getDoubleValue( "/systems/electrical/outputs/fuel-pump",
-                                    1.0 ) >= 1.0;
 
-       net->starter_power[i]
-            = node->getDoubleValue( "/systems/electrical/outputs/starter",
-                                    1.0 ) >= 1.0;
+        if ( fuelpump != NULL ) {
+            net->fuel_pump_power[i] = ( fuelpump->getDoubleValue() >= 1.0 );
+        } else {
+            net->fuel_pump_power[i] = 0.0;
+        }
+
+        if ( starter != NULL ) {
+            net->starter_power[i] = ( starter->getDoubleValue() >= 1.0 );
+        } else {
+            net->starter_power[i] = 0.0;
+        }
 
        // Faults
        SGPropertyNode *faults = node->getChild( "faults", 0, true );
@@ -164,21 +173,10 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
             net->fuel_selector[i] = false;
         }
     }
-    net->num_wheels = FGNetCtrls::FG_MAX_WHEELS;
-    tempnode = fgGetNode("/controls/gear", true);
-    for ( i = 0; i < FGNetCtrls::FG_MAX_WHEELS; ++i ) {
-        node = fgGetNode("/controls/gear/wheel", i);
-        if ( node != NULL && node->getChild("brake") != NULL ) {
-            if ( tempnode->getChild("parking-brake")->getDoubleValue() > 0.0 ) {
-                net->brake[i] = 1.0;
-           } else {
-                net->brake[i]
-                    = node->getChild("brake")->getDoubleValue();
-            }
-        } else {
-            net->brake[i] = 0.0;
-        }
-    }
+    node = fgGetNode("/controls/gear", true);
+    net->brake_left = node->getChild("brake-left")->getDoubleValue();
+    net->brake_right = node->getChild("brake-right")->getDoubleValue();
+    net->brake_parking = node->getChild("brake-parking")->getDoubleValue();
 
     node = fgGetNode("/controls/switches", true);
     tempnode = node->getChild("master-bat");
@@ -252,10 +250,9 @@ void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
             net->fuel_selector[i] = htonl(net->fuel_selector[i]);
         }
         net->num_tanks = htonl(net->num_tanks);
-        for ( i = 0; i < FGNetCtrls::FG_MAX_WHEELS; ++i ) {
-            htond(net->brake[i]);
-        }
-        net->num_wheels = htonl(net->num_wheels);
+        htond(net->brake_left);
+        htond(net->brake_right);
+        htond(net->brake_parking);
         net->gear_handle = htonl(net->gear_handle);
         net->master_bat = htonl(net->master_bat);
         net->master_alt = htonl(net->master_alt);
@@ -310,10 +307,9 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes,
         for ( i = 0; i < net->num_tanks; ++i ) {
             net->fuel_selector[i] = htonl(net->fuel_selector[i]);
         }
-        net->num_wheels = htonl(net->num_wheels);
-        for ( i = 0; i < net->num_wheels; ++i ) {
-            htond(net->brake[i]);
-        }
+        htond(net->brake_left);
+        htond(net->brake_right);
+        htond(net->brake_parking);
         net->gear_handle = htonl(net->gear_handle);
         net->master_bat = htonl(net->master_bat);
         net->master_alt = htonl(net->master_alt);
@@ -377,11 +373,11 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes,
         node->getChild( "fuel_selector" )
             ->setBoolValue( net->fuel_selector[i] );
     }
-    for ( i = 0; i < FGNetCtrls::FG_MAX_WHEELS; ++i ) {
-        node = fgGetNode( "/controls/gear/wheel", i );
-        if ( node != NULL ) {
-            node->getChild( "brake" )->setDoubleValue( net->brake[i] );
-        }
+    node = fgGetNode( "/controls/gear" );
+    if ( node != NULL ) {
+        node->getChild( "brake-left" )->setDoubleValue( net->brake_left );
+        node->getChild( "brake-right" )->setDoubleValue( net->brake_right );
+        node->getChild( "brake-parking" )->setDoubleValue( net->brake_parking );
     }
 
     node = fgGetNode( "/controls/gear", true );