Changed naming scheme of basic shared structures.

[flightgear.git] / Aircraft / aircraft.c

diff --git a/Aircraft/aircraft.c b/Aircraft/aircraft.c
index af285f13c7af6b8cd48bbe3cf8cac12cccd6980c..4aa51e0b44b2219d8f33062d0856c8308accfcec 100644 (file)
--- a/Aircraft/aircraft.c
+++ b/Aircraft/aircraft.c
@@ -24,24 +24,23 @@
  **************************************************************************/
 
 
-#include <math.h>
 #include <stdio.h>
 
 #include "aircraft.h"
+#include "../constants.h"
 
-#define FG_RAD_2_DEG(RAD) ((RAD) * 180.0 / M_PI)
 
 /* Display various parameters to stdout */
 void aircraft_debug(int type) {
-    struct flight_params *f;
-    struct control_params *c;
+    struct FLIGHT *f;
+    struct CONTROLS *c;
 
     f = &current_aircraft.flight;
     c = &current_aircraft.controls;
 
     printf("Pos = (%.2f,%.2f,%.2f)  (Phi,Theta,Psi)=(%.2f,%.2f,%.2f)\n",
-          FG_RAD_2_DEG(FG_Longitude) * 3600.0, 
-           FG_RAD_2_DEG(FG_Latitude) * 3600.0, 
+          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]);
@@ -49,9 +48,18 @@ void aircraft_debug(int type) {
 
 
 /* $Log$
-/* Revision 1.7  1997/06/02 03:01:39  curt
-/* Working on views (side, front, back, transitions, etc.)
+/* Revision 1.10  1997/08/27 03:29:56  curt
+/* Changed naming scheme of basic shared structures.
 /*
+ * Revision 1.9  1997/07/19 22:39:08  curt
+ * Moved PI to ../constants.h
+ *
+ * Revision 1.8  1997/06/25 15:39:45  curt
+ * Minor changes to compile with rsxnt/win32.
+ *
+ * Revision 1.7  1997/06/02 03:01:39  curt
+ * Working on views (side, front, back, transitions, etc.)
+ *
  * Revision 1.6  1997/05/31 19:16:26  curt
  * Elevator trim added.
  *