Merged in make system changes from Bob Kuehne <rpk@sgi.com>

[flightgear.git] / Aircraft / aircraft.c

diff --git a/Aircraft/aircraft.c b/Aircraft/aircraft.c
index cb8f27e781b2039669b4a266d84b84e1bfca3e4a..54e47f539a9dc5545ced68168409eade185351ce 100644 (file)
--- a/Aircraft/aircraft.c
+++ b/Aircraft/aircraft.c
@@ -26,14 +26,19 @@
 
 #include <stdio.h>
 
-#include "aircraft.h"
-#include "../constants.h"
+#include <Aircraft/aircraft.h>
+#include <Include/constants.h>
+
+
+/* This is a record containing all the info for the aircraft currently
+   being operated */
+struct fgAIRCRAFT current_aircraft;
 
 
 /* Display various parameters to stdout */
-void fgAircraftOutputCurrent(struct AIRCRAFT *a) {
-    struct FLIGHT *f;
-    struct CONTROLS *c;
+void fgAircraftOutputCurrent(struct fgAIRCRAFT *a) {
+    struct fgFLIGHT *f;
+    struct fgCONTROLS *c;
 
     f = &a->flight;
     c = &a->controls;
@@ -48,10 +53,22 @@ void fgAircraftOutputCurrent(struct AIRCRAFT *a) {
 
 
 /* $Log$
-/* Revision 1.11  1997/09/13 02:00:05  curt
-/* Mostly working on stars and generating sidereal time for accurate star
-/* placement.
+/* Revision 1.14  1998/01/19 19:26:56  curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
 /*
+ * Revision 1.13  1997/12/15 23:54:30  curt
+ * Add xgl wrappers for debugging.
+ * Generate terrain normals on the fly.
+ *
+ * Revision 1.12  1997/12/10 22:37:37  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.11  1997/09/13 02:00:05  curt
+ * Mostly working on stars and generating sidereal time for accurate star
+ * placement.
+ *
  * Revision 1.10  1997/08/27 03:29:56  curt
  * Changed naming scheme of basic shared structures.
  *