More misc. tweaks for rpk make merge.

[flightgear.git] / FDM / flight.c

diff --git a/FDM/flight.c b/FDM/flight.c
index cee1482955c2c2cc394227eaaea0ceb1aee1014d..71eb5caefe0c875fd323a2e8db6b3304a9be349c 100644 (file)
--- a/FDM/flight.c
+++ b/FDM/flight.c
@@ -24,13 +24,16 @@
  **************************************************************************/
 
 #include <stdio.h>
-#include "flight.h"
+#include <Flight/flight.h>
+#include <Flight/LaRCsim/ls_interface.h>
 
 
 /* Initialize the flight model parameters */
-int fgFlightModelInit(int model, struct FLIGHT *f, double dt) {
+int fgFlightModelInit(int model, struct fgFLIGHT *f, double dt) {
     int result;
 
+    printf("Initializing flight model\n");
+
     if ( model == FG_LARCSIM ) {
        fgFlight_2_LaRCsim(f);  /* translate FG to LaRCsim structure */
        fgLaRCsimInit(dt);
@@ -40,12 +43,14 @@ int fgFlightModelInit(int model, struct FLIGHT *f, double dt) {
        printf("Unimplemented flight model == %d\n", model);
     }
 
+    result = 1;
+
     return(result);
 }
 
 
 /* Run multiloop iterations of the flight model */
-int fgFlightModelUpdate(int model, struct FLIGHT *f, int multiloop) {
+int fgFlightModelUpdate(int model, struct fgFLIGHT *f, int multiloop) {
     int result;
 
     if ( model == FG_LARCSIM ) {
@@ -56,14 +61,34 @@ int fgFlightModelUpdate(int model, struct FLIGHT *f, int multiloop) {
        printf("Unimplemented flight model == %d\n", model);
     }
 
+    result = 1;
+
     return(result);
 }
 
 
 /* $Log$
-/* Revision 1.3  1997/08/27 03:30:04  curt
-/* Changed naming scheme of basic shared structures.
+/* 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.
+ *
+ * Revision 1.4  1997/12/10 22:37:42  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.3  1997/08/27 03:30:04  curt
+ * Changed naming scheme of basic shared structures.
+ *
  * Revision 1.2  1997/05/29 22:39:57  curt
  * Working on incorporating the LaRCsim flight model.
  *