FG_HAVE_STD_INCLUDES -> SG_HAVE_STD_INCLUDES

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

diff --git a/src/FDM/JSBSim/FGControls.h b/src/FDM/JSBSim/FGControls.h
index 24b37e7bbfa85cbeb89456b88edb38762c01d0a8..52a5a557f4f2c44b88ec9720f5e9b59133f0d8fe 100644 (file)
--- a/src/FDM/JSBSim/FGControls.h
+++ b/src/FDM/JSBSim/FGControls.h
@@ -25,22 +25,25 @@
 #ifndef _CONTROLS_HXX
 #define _CONTROLS_HXX
 
-
 #ifndef __cplusplus                                                          
 # error This library requires C++
 #endif                                   
 
+#define ID_CONTROLS "$Header"
+
 // Define a structure containing the control parameters
 
 class FGControls {
 
 public:
 
-    static const int ALL_ENGINES = -1;
-    static const int MAX_ENGINES = 10;
+    enum {
+      ALL_ENGINES = -1,
+      MAX_ENGINES = 10,
 
-    static const int ALL_WHEELS = -1;
-    static const int MAX_WHEELS = 3;
+      ALL_WHEELS = -1,
+      MAX_WHEELS = 3
+    };
 
 private:
 
@@ -175,36 +178,14 @@ extern FGControls controls;
 
 
 // $Log$
-// Revision 1.9  2000/05/16 19:35:11  curt
-// Updates from the Jon and Tony show.
-//
-// Tony submitted:
-//
-// JSBsim:
-// Added trimming routine, it is longitudinal & in-air only at this point
-// Added support for taking wind & weather data from external source
-// Added support for flaps.
-// Added independently settable pitch trim
-// Added alphamin and max to config file, stall modeling and warning to
-// follow
-//
-// c172.cfg:
-// Flaps!
-// Adjusted Cmo, model should be speed stable now
-//
-// FG:
-// Hooked up Christian's weather code, should be using it soon.
-// Hooked up the trimming routine.  Note that the X-15 will not trim.
-//   This is not a model or trimming routine deficiency, just the
-//   nature of the X-15
-// The trimming routine sets the pitch trim and and throttle at startup.
-// The throttle is set using Norman's code for the autothrottle so the
-// autothrottle is on by default.  --notrim will turn it off.
-// Added --vc, --mach, and --notrim switches
-//       (vc is airspeed in knots)
-// uBody, vBody, and wBody are still supported, last one entered
-// on the command line counts, i.e. you can set vc or mach or u,v,
-// and w but any combination will be ignored.
+// Revision 1.20  2000/11/14 19:32:03  curt
+// Nov. 14, 2000 JSBSim updates
+//
+// Revision 1.7  2000/10/13 19:21:02  jsb
+// ** JSB ** Added version identifiers for all files
+//
+// Revision 1.6  2000/06/03 13:59:52  jsb
+// Changes for compatibility with MSVC
 //
 // Revision 1.5  2000/05/12 22:45:35  jsb
 // Removed extraneous namespace identifiers and header files