C++ - ifing the code a bit.

[flightgear.git] / Aircraft / aircraft.h

diff --git a/Aircraft/aircraft.h b/Aircraft/aircraft.h
index 96e4c576fa169de9638314a56672a6d4db67e10a..9f67798047ddde8daf3d0578d5c3af28ddeb31da 100644 (file)
--- a/Aircraft/aircraft.h
+++ b/Aircraft/aircraft.h
@@ -24,37 +24,87 @@
  **************************************************************************/
 
 
-#ifndef AIRCRAFT_H
-#define AIRCRAFT_H
+#ifndef _AIRCRAFT_H
+#define _AIRCRAFT_H
+
 
 #include <Flight/flight.h>
 #include <Controls/controls.h>
 
 
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
 /* Define a structure containing all the parameters for an aircraft */
-struct fgAIRCRAFT {
-    struct fgFLIGHT flight;
-    struct fgCONTROLS controls;
-};
+typedef struct{
+    fgFLIGHT   *flight;
+    fgCONTROLS *controls;
+} fgAIRCRAFT ;
 
 
 /* current_aircraft contains all the parameters of the aircraft
    currently being operated. */
-extern struct fgAIRCRAFT current_aircraft;
+extern fgAIRCRAFT current_aircraft;
+
+
+/* Initialize an Aircraft structure */
+void fgAircraftInit( void );
 
 
 /* Display various parameters to stdout */
-void fgAircraftOutputCurrent(struct fgAIRCRAFT *a);
+void fgAircraftOutputCurrent(fgAIRCRAFT *a);
 
 
-#endif /* AIRCRAFT_H */
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _AIRCRAFT_H */
+
+
+/* $Log$
+/* Revision 1.12  1998/04/22 13:26:15  curt
+/* C++ - ifing the code a bit.
+/*
+ * Revision 1.11  1998/04/21 17:02:27  curt
+ * Prepairing for C++ integration.
+ *
+ * Revision 1.10  1998/02/07 15:29:32  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
+ * Revision 1.9  1998/01/22 02:59:23  curt
+ * Changed #ifdef FILE_H to #ifdef _FILE_H
+ *
+ * Revision 1.8  1998/01/19 19:26:57  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
+ * Revision 1.7  1997/12/10 22:37:38  curt
+ * Prepended "fg"AIRCRAFT_H */
 
 
 /* $Log$
-/* Revision 1.8  1998/01/19 19:26:57  curt
-/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
-/* This should simplify things tremendously.
+/* Revision 1.12  1998/04/22 13:26:15  curt
+/* C++ - ifing the code a bit.
 /*
+ * Revision 1.11  1998/04/21 17:02:27  curt
+ * Prepairing for C++ integration.
+ *
+ * Revision 1.10  1998/02/07 15:29:32  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
+ * Revision 1.9  1998/01/22 02:59:23  curt
+ * Changed #ifdef FILE_H to #ifdef _FILE_H
+ *
+ * Revision 1.8  1998/01/19 19:26:57  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.7  1997/12/10 22:37:38  curt
  * Prepended "fg" on the name of all global structures that didn't have it yet.
  * i.e. "struct WEATHER {}" became "struct fgWEATHER {}"