Sync. with JSBSim CVS.

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

diff --git a/src/FDM/JSBSim/FGTank.h b/src/FDM/JSBSim/FGTank.h
index c04f7128b30aa1bd77d8300b9a0174a899da73c2..9cd81c58e927f3b2fb0daa741dca81a201789610 100644 (file)
--- a/src/FDM/JSBSim/FGTank.h
+++ b/src/FDM/JSBSim/FGTank.h
@@ -44,8 +44,9 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#include "FGConfigFile.h"
 #include "FGJSBBase.h"
+#include "FGConfigFile.h"
+#include "FGColumnVector3.h"
 
 #ifdef FGFS
 #  include <simgear/compiler.h>
@@ -98,9 +99,8 @@ public:
   bool GetSelected(void) {return Selected;}
   double GetPctFull(void) {return PctFull;}
   double GetContents(void) {return Contents;}
-  double inline GetX(void) {return X;}
-  double inline GetY(void) {return Y;}
-  double inline GetZ(void) {return Z;}
+  const FGColumnVector3& GetXYZ(void) {return vXYZ;}
+  double GetXYZ(int idx) {return vXYZ(idx);}
 
   void SetContents(double contents) { Contents = contents; }
 
@@ -109,7 +109,7 @@ public:
 private:
   TankType Type;
   string type;
-  double X, Y, Z;
+  FGColumnVector3 vXYZ;
   double Capacity;
   double Radius;
   double PctFull;