C++-ifying.

[flightgear.git] / Autopilot / autopilot.hxx

diff --git a/Autopilot/autopilot.hxx b/Autopilot/autopilot.hxx
index 4c70a8f369ce5640f647026290fbe8bdf6ce9e47..5e6e426c715e15f0bd828cd6707f2a7103a913b8 100644 (file)
--- a/Autopilot/autopilot.hxx
+++ b/Autopilot/autopilot.hxx
@@ -27,8 +27,8 @@
 #define _AUTOPILOT_H
                        
 
-#include <Aircraft/aircraft.h>
-#include <Flight/flight.h>
+#include <Aircraft/aircraft.hxx>
+#include <Flight/flight.hxx>
 #include <Controls/controls.h>
                        
                        
@@ -39,12 +39,18 @@ extern "C" {
 
 // Structures
 typedef struct {
-    int heading_hold;  // the current state of the heading hold
-    int altitude_hold; // the current state of the altitude hold
+    int heading_hold;   // the current state of the heading hold
+    int altitude_hold;  // the current state of the altitude hold
+    int terrain_follow; // the current state of the terrain follower
+    int auto_throttle;  // the current state of the auto throttle
 
     double TargetHeading;     // the heading the AP should steer to.
     double TargetAltitude;    // altitude to hold
+    double TargetAGL;         // the terrain separation
+    double TargetClimbRate;   // climb rate to shoot for
+    double TargetSpeed;       // speed to shoot for
     double alt_error_accum;   // altitude error accumulator
+    double speed_error_accum; // speed error accumulator
 
     double TargetSlope; // the glide slope hold value
     
@@ -68,6 +74,8 @@ void fgAPInit( fgAIRCRAFT *current_aircraft );
 int fgAPRun( void );
 void fgAPToggleHeading( void );
 void fgAPToggleAltitude( void );
+void fgAPToggleTerrainFollow( void );
+void fgAPToggleAutoThrottle( void );
 
 
 #ifdef __cplusplus