Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss

[flightgear.git] / Aircraft / aircraft.c

diff --git a/Aircraft/aircraft.c b/Aircraft/aircraft.c
index 54e47f539a9dc5545ced68168409eade185351ce..5d478b8325b64f2fa848429c846dff621a54a768 100644 (file)
--- a/Aircraft/aircraft.c
+++ b/Aircraft/aircraft.c
@@ -27,36 +27,55 @@
 #include <stdio.h>
 
 #include <Aircraft/aircraft.h>
-#include <Include/constants.h>
-
+#include <Include/fg_constants.h>
+#include <Main/fg_debug.h>
 
 /* This is a record containing all the info for the aircraft currently
    being operated */
-struct fgAIRCRAFT current_aircraft;
+fgAIRCRAFT current_aircraft;
+
+
+/* Initialize an Aircraft structure */
+void fgAircraftInit( void ) {
+    fgPrintf( FG_AIRCRAFT, FG_INFO, "Initializing Aircraft structure\n" );
+
+    current_aircraft.flight = &cur_flight_params;
+    current_aircraft.controls = &cur_control_params;
+}
 
 
 /* Display various parameters to stdout */
-void fgAircraftOutputCurrent(struct fgAIRCRAFT *a) {
-    struct fgFLIGHT *f;
-    struct fgCONTROLS *c;
+void fgAircraftOutputCurrent(fgAIRCRAFT *a) {
+    fgFLIGHT *f;
+    fgCONTROLS *c;
 
-    f = &a->flight;
-    c = &a->controls;
+    f = a->flight;
+    c = a->controls;
 
-    printf("Pos = (%.2f,%.2f,%.2f)  (Phi,Theta,Psi)=(%.2f,%.2f,%.2f)\n",
-          FG_Longitude * 3600.0 * RAD_TO_DEG, 
-           FG_Latitude  * 3600.0 * RAD_TO_DEG,
-          FG_Altitude, FG_Phi, FG_Theta, FG_Psi);
-    printf("Kts = %.0f  Elev = %.2f, Aileron = %.2f, Rudder = %.2f  Power = %.2f\n", 
-          FG_V_equiv_kts, FG_Elevator, FG_Aileron, FG_Rudder, FG_Throttle[0]);
+    fgPrintf( FG_FLIGHT, FG_DEBUG,
+             "Pos = (%.2f,%.2f,%.2f)  (Phi,Theta,Psi)=(%.2f,%.2f,%.2f)\n",
+             FG_Longitude * 3600.0 * RAD_TO_DEG, 
+             FG_Latitude  * 3600.0 * RAD_TO_DEG,
+             FG_Altitude, FG_Phi, FG_Theta, FG_Psi);
+    fgPrintf( FG_FLIGHT, FG_DEBUG,
+             "Kts = %.0f  Elev = %.2f, Aileron = %.2f, Rudder = %.2f  Power = %.2f\n", 
+             FG_V_equiv_kts, FG_Elevator, FG_Aileron, FG_Rudder, FG_Throttle[0]);
 }
 
 
 /* $Log$
-/* 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.16  1998/02/07 15:29:31  curt
+/* Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+/* <chotchkiss@namg.us.anritsu.com>
 /*
+ * Revision 1.15  1998/01/27 00:47:46  curt
+ * Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
+ * system and commandline/config file processing code.
+ *
+ * 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.