ATIS fixes/refactoring from John Denker

[flightgear.git] / src / Aircraft / controls.cxx

diff --git a/src/Aircraft/controls.cxx b/src/Aircraft/controls.cxx
index 2e3da344c27445d30b3ef68ecc3dd8804f1d4580..a37150c448870f96f69f97203883b5f22d6c2b77 100644 (file)
--- a/src/Aircraft/controls.cxx
+++ b/src/Aircraft/controls.cxx
@@ -205,8 +205,10 @@ FGControls::init ()
        magnetos[engine] = 0;
        feed_tank[engine] = -1; // set to -1 to turn off all tanks 0 feeds all engines from center body tank
        starter[engine] = false;
+        feather[engine] = false;
         ignition[engine] = false;
         fire_switch[engine] = false;
+        fire_bottle_discharge[engine] = false;
         cutoff[engine] = true;
         augmentation[engine] = false;
         reverser[engine] = false;
@@ -214,6 +216,21 @@ FGControls::init ()
         nitrous_injection[engine] = false;
         cowl_flaps_norm[engine] = 0.0;
         condition[engine] = 1.0;
+        carb_heat[engine] = false;
+        inlet_heat[engine] = false;
+        generator_breaker[engine] = false;
+        bus_tie[engine] = false;
+        engine_bleed[engine] = false;
+    }
+
+    for ( int tank = 0; tank < MAX_TANKS; tank++ ) {
+        fuel_selector[tank] = false;
+        to_engine[tank] = 0;
+        to_tank[tank] = 0;
+    }
+
+    for( int pump = 0; pump < MAX_TANKS * MAX_BOOSTPUMPS; pump++ ) {
+        boost_pump[pump] = false;
     }
 
     brake_left = brake_right
@@ -860,7 +877,7 @@ void FGControls::unbind ()
              "/controls/engines/engine[%d]/starter", index);
     fgUntie(name);
     snprintf(name, MAX_NAME_LEN,
-             "/controls/engines/engine[%d]/fuel_pump", index);
+             "/controls/engines/engine[%d]/fuel-pump", index);
     fgUntie(name);
     snprintf(name, MAX_NAME_LEN,
              "/controls/engines/engine[%d]/fire-switch", index);