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

[flightgear.git] / FDM / flight.c

diff --git a/FDM/flight.c b/FDM/flight.c
index bd51d550061fd3152f96c48b575e6545b0609d40..7290f2a7450ef445eb5938f38bd525e028ae84b3 100644 (file)
--- a/FDM/flight.c
+++ b/FDM/flight.c
@@ -24,22 +24,28 @@
  **************************************************************************/
 
 #include <stdio.h>
-#include "flight.h"
+
+#include <Debug/fg_debug.h>
+#include <Flight/flight.h>
+#include <Flight/LaRCsim/ls_interface.h>
+
+
+fgFLIGHT cur_flight_params;
 
 
 /* Initialize the flight model parameters */
-int fgFlightModelInit(int model, struct fgFLIGHT *f, double dt) {
+int fgFlightModelInit(int model, fgFLIGHT *f, double dt) {
     int result;
 
-    printf("Initializing flight model\n");
+    fgPrintf(FG_FLIGHT,FG_INFO,"Initializing flight model\n");
 
     if ( model == FG_LARCSIM ) {
        fgFlight_2_LaRCsim(f);  /* translate FG to LaRCsim structure */
        fgLaRCsimInit(dt);
-       printf("FG pos = %.2f\n", FG_Latitude);
+       fgPrintf(FG_FLIGHT,FG_INFO,"FG pos = %.2f\n", FG_Latitude);
        fgLaRCsim_2_Flight(f);  /* translate LaRCsim back to FG structure */
     } else {
-       printf("Unimplemented flight model == %d\n", model);
+       fgPrintf(FG_FLIGHT,FG_WARN,"Unimplemented flight model == %d\n", model);
     }
 
     result = 1;
@@ -49,15 +55,13 @@ int fgFlightModelInit(int model, struct fgFLIGHT *f, double dt) {
 
 
 /* Run multiloop iterations of the flight model */
-int fgFlightModelUpdate(int model, struct fgFLIGHT *f, int multiloop) {
+int fgFlightModelUpdate(int model, fgFLIGHT *f, int multiloop) {
     int result;
 
     if ( model == FG_LARCSIM ) {
-       fgFlight_2_LaRCsim(f);  /* translate FG to LaRCsim structure */
-       fgLaRCsimUpdate(multiloop);
-       fgLaRCsim_2_Flight(f);  /* translate LaRCsim back to FG structure */
+       fgLaRCsimUpdate(f, multiloop);
     } else {
-       printf("Unimplemented flight model == %d\n", model);
+       fgPrintf(FG_FLIGHT,FG_WARN,"Unimplemented flight model == %d\n", model);
     }
 
     result = 1;
@@ -67,9 +71,35 @@ int fgFlightModelUpdate(int model, struct fgFLIGHT *f, int multiloop) {
 
 
 /* $Log$
-/* Revision 1.6  1998/01/19 18:35:43  curt
-/* Minor tweaks and fixes for cygwin32.
+/* Revision 1.13  1998/04/25 22:06:28  curt
+/* Edited cvs log messages in source files ... bad bad bad!
 /*
+ * Revision 1.12  1998/04/21 16:59:33  curt
+ * Integrated autopilot.
+ * Prepairing for C++ integration.
+ *
+ * Revision 1.11  1998/04/18 04:14:04  curt
+ * Moved fg_debug.c to it's own library.
+ *
+ * Revision 1.10  1998/02/07 15:29:37  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
+ * Revision 1.9  1998/01/27 00:47:53  curt
+ * Incorporated Paul Bleisch's <pbleisch@acm.org> new debug message
+ * system and commandline/config file processing code.
+ *
+ * Revision 1.8  1998/01/19 19:27:03  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
+ * Revision 1.7  1998/01/19 18:40:23  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
+ * Revision 1.6  1998/01/19 18:35:43  curt
+ * Minor tweaks and fixes for cygwin32.
+ *
  * Revision 1.5  1997/12/30 20:47:37  curt
  * Integrated new event manager with subsystem initializations.
  *