Merge branch 'ehofman/particle'

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

diff --git a/src/Aircraft/controls.hxx b/src/Aircraft/controls.hxx
index 0d107b37340dc07f9a03664a9ec858528007382f..d9ea286f7ebf6946917643aaa91ff1f172ec10f4 100644 (file)
--- a/src/Aircraft/controls.hxx
+++ b/src/Aircraft/controls.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -24,16 +24,8 @@
 #ifndef _CONTROLS_HXX
 #define _CONTROLS_HXX
 
-#include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
-#include <Main/globals.hxx>
-
-#ifndef __cplusplus                                                          
-# error This library requires C++
-#endif                                   
-
-
 // Define a structure containing the control parameters
 
 class FGControls : public SGSubsystem
@@ -43,7 +35,7 @@ public:
 
     enum {
        ALL_ENGINES = -1,
-       MAX_ENGINES = 10
+       MAX_ENGINES = 12
     };
 
     enum {
@@ -133,6 +125,7 @@ private:
     double mixture[MAX_ENGINES];
     double prop_advance[MAX_ENGINES];
     int magnetos[MAX_ENGINES];
+    int feed_tank[MAX_ENGINES];
     bool nitrous_injection[MAX_ENGINES];  // War Emergency Power
     double cowl_flaps_norm[MAX_ENGINES];
     bool feather[MAX_ENGINES];
@@ -160,6 +153,7 @@ private:
     double copilot_brake_right;
     double brake_parking;
     double steering;
+    bool nose_wheel_steering;
     bool gear_down;
     bool antiskid;
     bool tailhook;
@@ -257,7 +251,7 @@ private:
     int lateral_mode;
      
 
-    SGPropertyNode * auto_coordination;
+    SGPropertyNode_ptr auto_coordination;
 
 public:
 
@@ -307,6 +301,7 @@ public:
        return prop_advance[engine];
     }
     inline int get_magnetos(int engine) const { return magnetos[engine]; }
+    inline int get_feed_tank(int engine) const { return feed_tank[engine]; }
     inline bool get_nitrous_injection(int engine) const { 
         return nitrous_injection[engine];
     }
@@ -344,6 +339,7 @@ public:
     inline double get_copilot_brake_right() const { return copilot_brake_right; }
     inline double get_brake_parking() const { return brake_parking; }
     inline double get_steering() const { return steering; }
+    inline bool get_nose_wheel_steering() const { return nose_wheel_steering; }
     inline bool get_gear_down() const { return gear_down; }
     inline bool get_antiskid() const { return antiskid; }
     inline bool get_tailhook() const { return tailhook; }
@@ -499,6 +495,7 @@ public:
     void move_prop_advance( int engine, double amt );
     void set_magnetos( int engine, int pos );
     void move_magnetos( int engine, int amt );
+    void set_feed_tank( int engine, int tank );
     void set_nitrous_injection( int engine, bool val );
     void set_cowl_flaps_norm( int engine, double pos );
     void move_cowl_flaps_norm( int engine, double amt );
@@ -530,6 +527,7 @@ public:
     void set_brake_parking( double pos );
     void set_steering( double pos );
     void move_steering( double amt );
+    void set_nose_wheel_steering( bool nws );
     void set_gear_down( bool gear );
     void set_antiskid( bool val );
     void set_tailhook( bool val );