Latest changes from Jon, plus ...

[flightgear.git] / JSBsim / FGTank.h

diff --git a/JSBsim/FGTank.h b/JSBsim/FGTank.h
index 6923f644782c8051750ad06bfbd850a7fd51cb27..a41841c8555f87ebc2981479ff512d11c632279f 100644 (file)
--- a/JSBsim/FGTank.h
+++ b/JSBsim/FGTank.h
@@ -32,9 +32,8 @@ a generic Tank.
 HISTORY
 --------------------------------------------------------------------------------
 01/21/99   JSB   Created
-*******************************************************************************/
 
-/*******************************************************************************
+********************************************************************************
 SENTRY
 *******************************************************************************/
 
@@ -44,8 +43,19 @@ SENTRY
 /*******************************************************************************
 INCLUDES
 *******************************************************************************/
-
-#include <fstream.h>
+#ifdef FGFS
+#  include <Include/compiler.h>
+#  include STL_STRING
+#  ifdef FG_HAVE_STD_INCLUDES
+#    include <fstream>
+#  else
+#    include <fstream.h>
+#  endif
+   FG_USING_STD(string);
+#else
+#  include <string>
+#  include <fstream>
+#endif
 
 /*******************************************************************************
 DEFINES
@@ -65,11 +75,14 @@ public:
   int GetType(void) {return Type;}
   bool GetSelected(void) {return Selected;}
   float GetPctFull(void) {return PctFull;}
+  float GetContents(void) {return Contents;}
+
+  enum TankType {ttUNKNOWN, ttFUEL, ttOXIDIZER};
   
 private:
+  TankType Type;
   float X, Y, Z;
   float Capacity;
-  int   Type;
   float Radius;
   float PctFull;
   float Contents;