- adjusted for no-value constructor for FGPanel

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

diff --git a/src/Controls/controls.cxx b/src/Controls/controls.cxx
index d5152c739396c3b70a999705c3d30e8a96422128..203aaea4b33c4d93ffd4563bd5b373b01aefebcb 100644 (file)
--- a/src/Controls/controls.cxx
+++ b/src/Controls/controls.cxx
@@ -38,15 +38,6 @@ FGControls::FGControls() :
     rudder( 0.0 ),
     throttle_idle( true )
 {
-    for ( int engine = 0; engine < MAX_ENGINES; engine++ ) {
-       throttle[engine] = 0.0;
-       mixture[engine] = 1.0;
-       prop_advance[engine] = 1.0;
-    }
-
-    for ( int wheel = 0; wheel < MAX_WHEELS; wheel++ ) {
-        brake[wheel] = 0.0;
-    }
 }
 
 
@@ -69,6 +60,17 @@ FGControls::~FGControls() {
 void
 FGControls::init ()
 {
+    for ( int engine = 0; engine < MAX_ENGINES; engine++ ) {
+       throttle[engine] = 0.0;
+       mixture[engine] = 1.0;
+       prop_advance[engine] = 1.0;
+    }
+
+    for ( int wheel = 0; wheel < MAX_WHEELS; wheel++ ) {
+        brake[wheel] = 0.0;
+    }
+
+    auto_coordination = fgGetNode("/sim/auto-coordination", true);
 }
 
 
@@ -85,7 +87,8 @@ FGControls::bind ()
        &FGControls::get_rudder, &FGControls::set_rudder);
   fgTie("/controls/flaps", this,
        &FGControls::get_flaps, &FGControls::set_flaps);
-  for (int index = 0; index < MAX_ENGINES; index++) {
+  int index;
+  for (index = 0; index < MAX_ENGINES; index++) {
     char name[32];
     sprintf(name, "/controls/throttle[%d]", index);
     fgTie(name, this, index,
@@ -97,13 +100,13 @@ FGControls::bind ()
     fgTie(name, this, index,
         &FGControls::get_prop_advance, &FGControls::set_prop_advance);
   }
-  fgTie("/controls/throttle/all", this, ALL_ENGINES,
-       &FGControls::get_throttle, &FGControls::set_throttle);
-  fgTie("/controls/mixture/all", this, ALL_ENGINES,
-       &FGControls::get_mixture, &FGControls::set_mixture);
-  fgTie("/controls/propellor-pitch/all", this, ALL_ENGINES,
-       &FGControls::get_prop_advance, &FGControls::set_prop_advance);
-  for (int index = 0; index < MAX_WHEELS; index++) {
+//   fgTie("/controls/throttle/all", this, ALL_ENGINES,
+//     &FGControls::get_throttle, &FGControls::set_throttle);
+//   fgTie("/controls/mixture/all", this, ALL_ENGINES,
+//     &FGControls::get_mixture, &FGControls::set_mixture);
+//   fgTie("/controls/propellor-pitch/all", this, ALL_ENGINES,
+//     &FGControls::get_prop_advance, &FGControls::set_prop_advance);
+  for (index = 0; index < MAX_WHEELS; index++) {
     char name[32];
     sprintf(name, "/controls/brakes[%d]", index);
     fgTie(name, this, index,
@@ -123,7 +126,8 @@ FGControls::unbind ()
   fgUntie("/controls/elevator-trim");
   fgUntie("/controls/rudder");
   fgUntie("/controls/flaps");
-  for (int index = 0; index < MAX_ENGINES; index++) {
+  int index;
+  for (index = 0; index < MAX_ENGINES; index++) {
     char name[32];
     sprintf(name, "/controls/throttle[%d]", index);
     fgUntie(name);
@@ -132,7 +136,7 @@ FGControls::unbind ()
     sprintf(name, "/controls/propellor-pitch[%d]", index);
     fgUntie(name);
   }
-  for (int index = 0; index < MAX_WHEELS; index++) {
+  for (index = 0; index < MAX_WHEELS; index++) {
     char name[32];
     sprintf(name, "/controls/brakes[%d]", index);
     fgUntie(name);