Updated to latest JSBSim, including preliminary support for

[flightgear.git] / src / FDM / JSBSim / FGEngine.h

diff --git a/src/FDM/JSBSim/FGEngine.h b/src/FDM/JSBSim/FGEngine.h
index ce7b960d06083ccd748028cc73a785418c214ac8..8e2f92471d9ce6714ebc0836c9b7bae1708f5a9e 100644 (file)
--- a/src/FDM/JSBSim/FGEngine.h
+++ b/src/FDM/JSBSim/FGEngine.h
@@ -117,15 +117,15 @@ public:
   virtual double  GetThrottleMax(void) { return MaxThrottle; }
   double  GetThrottle(void) { return Throttle; }
   double  GetMixture(void) { return Mixture; }
-  int    GetMagnetos(void) { return Magnetos; }
+  int     GetMagnetos(void) { return Magnetos; }
   bool    GetStarter(void) { return Starter; }
   double  GetThrust(void) { return Thrust; }
-  bool   GetStarved(void) { return Starved; }
-  bool   GetFlameout(void) { return Flameout; }
-  bool   GetRunning(void) { return Running; }
-  bool   GetCranking(void) { return Cranking; }
-  int    GetType(void) { return Type; }
-  string GetName(void) { return Name; }
+  bool    GetStarved(void) { return Starved; }
+  bool    GetFlameout(void) { return Flameout; }
+  bool    GetRunning(void) { return Running; }
+  bool    GetCranking(void) { return Cranking; }
+  int     GetType(void) { return Type; }
+  string  GetName(void) { return Name; }
 
   virtual double getManifoldPressure_inHg () const {
     return ManifoldPressure_inHg;
@@ -182,6 +182,9 @@ public:
   /// Sets engine placement information
   void SetPlacement(double x, double y, double z, double pitch, double yaw);
 
+  /// Sets the engine number
+  void SetEngineNumber(int nn) {EngineNumber = nn;}
+
   virtual double GetPowerAvailable(void) {return 0.0;};
 
   bool GetTrimMode(void) {return TrimMode;}
@@ -231,7 +234,7 @@ protected:
   FGOutput*       Output;
 
   vector <int> SourceTanks;
-  void Debug(void);
+  virtual void Debug(int from);
 };
 
 #include "FGState.h"