More misc. tweaks for rpk make merge.

[flightgear.git] / Slew / slew.c

diff --git a/Slew/slew.c b/Slew/slew.c
index 3f81dfb1748cf8fd4678f0def8a937fdbe415a86..3a4e28eea79e077590a9be599c7585f1a1dd36e7 100644 (file)
--- a/Slew/slew.c
+++ b/Slew/slew.c
@@ -26,11 +26,11 @@
 
 #include <math.h>
 
-#include "slew.h"
-#include "../flight.h"
-#include "../../Aircraft/aircraft.h"
-#include "../../Controls/controls.h"
-#include "../../constants.h"
+#include <Flight/Slew/slew.h>
+#include <Flight/flight.h>
+#include <Aircraft/aircraft.h>
+#include <Controls/controls.h>
+#include <Include/constants.h>
 
 
 #ifndef M_PI                                    
@@ -44,11 +44,12 @@
 
 /* reset flight params to a specific position */
 void fgSlewInit(double pos_x, double pos_y, double pos_z, double heading) {
-    struct FLIGHT *f;
+    struct fgFLIGHT *f;
 
     f = &current_aircraft.flight;
 
-    /*    f->pos_x = pos_x;
+    /*
+    f->pos_x = pos_x;
     f->pos_y = pos_y;
     f->pos_z = pos_z;
 
@@ -64,14 +65,15 @@ void fgSlewInit(double pos_x, double pos_y, double pos_z, double heading) {
     f->vel_Theta = 0.0;
     f->vel_Psi = 0.0;
 
-    f->Psi = heading; */
+    f->Psi = heading;
+    */
 }
 
 
 /* update position based on inputs, positions, velocities, etc. */
-void fgSlewUpdate() {
-    struct FLIGHT *f;
-    struct CONTROLS *c;
+void fgSlewUpdate( void ) {
+    struct fgFLIGHT *f;
+    struct fgCONTROLS *c;
 
     f = &current_aircraft.flight;
     c = &current_aircraft.controls;
@@ -91,9 +93,21 @@ void fgSlewUpdate() {
 
 
 /* $Log$
-/* Revision 1.6  1997/08/27 03:30:11  curt
-/* Changed naming scheme of basic shared structures.
+/* Revision 1.9  1998/01/19 19:27:06  curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
 /*
+ * Revision 1.8  1998/01/19 18:40:30  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
+ * Revision 1.7  1997/12/15 23:54:42  curt
+ * Add xgl wrappers for debugging.
+ * Generate terrain normals on the fly.
+ *
+ * Revision 1.6  1997/08/27 03:30:11  curt
+ * Changed naming scheme of basic shared structures.
+ *
  * Revision 1.5  1997/07/19 22:35:06  curt
  * Moved fiddled with PI to avoid compiler warnings.
  *