Edited cvs log messages in source files ... bad bad bad!

[flightgear.git] / Controls / controls.h

diff --git a/Controls/controls.h b/Controls/controls.h
index a877e46e341b85b0eb08b64233daaad62146a827..b5009cdcb7a4dcbfef408f0c5dce1c4b556e96f4 100644 (file)
--- a/Controls/controls.h
+++ b/Controls/controls.h
@@ -24,22 +24,27 @@
  **************************************************************************/
 
 
-#ifndef CONTROLS_H
-#define CONTROLS_H
+#ifndef _CONTROLS_H
+#define _CONTROLS_H
 
 
-#include "../limits.h"
+#include <Include/fg_limits.h>
+
+
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
 
 
 /* Define a structure containing the control parameters */
 
-struct CONTROLS {
+typedef struct {
     double aileron;
     double elevator;
     double elevator_trim;
     double rudder;
     double throttle[FG_MAX_ENGINES];
-};
+} fgCONTROLS, *pfgControls;
 
 
 #define FG_Elevator     c->elevator
@@ -62,7 +67,9 @@ struct CONTROLS {
 */
 
 
-void fgControlsInit();
+extern fgCONTROLS cur_control_params;
+
+void fgControlsInit( void );
 
 void fgElevMove(double amt);
 void fgElevSet(double pos);
@@ -76,14 +83,53 @@ void fgThrottleMove(int engine, double amt);
 void fgThrottleSet(int engine, double pos);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 
-#endif /* CONTROLS_H */
+#endif /* _CONTROLS_H */
 
 
 /* $Log$
-/* Revision 1.5  1997/08/27 03:30:02  curt
-/* Changed naming scheme of basic shared structures.
+/* Revision 1.15  1998/04/25 22:06:27  curt
+/* Edited cvs log messages in source files ... bad bad bad!
 /*
+ * Revision 1.14  1998/04/22 13:26:19  curt
+ * C++ - ifing the code a bit.
+ *
+ * Revision 1.13  1998/04/21 17:02:35  curt
+ * Prepairing for C++ integration.
+ *
+ * Revision 1.12  1998/02/09 22:56:48  curt
+ * Removed "depend" files from cvs control.  Other minor make tweaks.
+ *
+ * Revision 1.11  1998/02/07 15:29:36  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
+ * Revision 1.10  1998/01/27 00:47:52  curt
+ * Incorporated Paul Bleisch's <pbleisch@acm.org> new debug message
+ * system and commandline/config file processing code.
+ *
+ * Revision 1.9  1998/01/22 02:59:31  curt
+ * Changed #ifdef FILE_H to #ifdef _FILE_H
+ *
+ * Revision 1.8  1998/01/19 18:40:22  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
+ * Revision 1.7  1997/12/15 23:54:36  curt
+ * Add xgl wrappers for debugging.
+ * Generate terrain normals on the fly.
+ *
+ * Revision 1.6  1997/12/10 22:37:41  curt
+ * Prepended "fg" on the name of all global structures that didn't have it yet.
+ * i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
+ *
+ * Revision 1.5  1997/08/27 03:30:02  curt
+ * Changed naming scheme of basic shared structures.
+ *
  * Revision 1.4  1997/07/23 21:52:18  curt
  * Put comments around the text after an #endif for increased portability.
  *