This set of changes touches a *lot* of files. The main goal here is to

[flightgear.git] / src / FDM / flight.hxx

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index cfac3ebfb8ac3a27a4d3e7ba4020774f81eb8702..e01fc43cf20d97fb8a63517dc0bf25ea854383b4 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -110,8 +110,8 @@ private:
     double Throttle;
     double Mixture;
     double Prop_Advance;
-    int Magnetos;                      // 0=off, 1=left, 2=right, 3=both
-    bool Starter;                      // flag to indicate the starter switch is on    
+//    int Magnetos;                    // 0=off, 1=left, 2=right, 3=both
+//    bool Starter;                    // flag to indicate the starter switch is on    
 
     // outputs
     double RPM;
@@ -161,8 +161,6 @@ public:
     inline void set_Throttle( double t ) { Throttle = t; }
     inline void set_Mixture( double m ) { Mixture = m; }
     inline void set_Prop_Advance( double p ) { Prop_Advance = p; }
-    inline void set_Magnetos( int m ) { Magnetos = m; }
-    inline void set_Starter( bool s ) { Starter = s; }
     inline void set_RPM( double r ) { RPM = r; }
     inline void set_Manifold_Pressure( double mp ) { Manifold_Pressure = mp; }
     inline void set_MaxHP( double hp ) { MaxHP = hp; }
@@ -172,6 +170,8 @@ public:
     inline void set_prop_thrust( double t ) { prop_thrust = t; }
     inline void set_Fuel_Flow( double f ) { Fuel_Flow = f; }
     inline void set_Oil_Temp (double o) { Oil_Temp = o; }
+    inline void set_Running_Flag (bool r) { running = r; }
+    inline void set_Cranking_Flag (bool c) { cranking = c; }
 
 };
 
@@ -183,6 +183,14 @@ class FGInterface : public FGSubsystem {
 
 private:
   
+    // Has the init() method been called.  This is used to delay
+    // initialization until scenery can be loaded and we know the true
+    // ground elevation.
+    bool inited;
+
+    // Have we bound to the property system
+    bool bound; 
+
     // periodic update management variable.  This is a scheme to run
     // the fdm with a fixed delta-t.  We control how many iteration of
     // the fdm to run with the fixed dt based on the elapsed time from
@@ -507,6 +515,12 @@ public:
        FG_EXTERNAL = 10
     };
 
+    // initialization
+    inline bool get_inited() const { return inited; }
+    inline void set_inited( bool value ) { inited = value; }
+
+    inline bool get_bound() const { return bound; }
+
     // time and update management values
     inline double get_delta_t() const { return delta_t; }
     inline void set_delta_t( double dt ) { delta_t = dt; }