Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss

[flightgear.git] / LaRCsim / ls_interface.c

diff --git a/LaRCsim/ls_interface.c b/LaRCsim/ls_interface.c
index 5eb52d1fd4b2b98c848bb71589087c9438f85c94..8a8dd993b17757cddbcda1f14ca44c99c97ea4a3 100644 (file)
--- a/LaRCsim/ls_interface.c
+++ b/LaRCsim/ls_interface.c
@@ -223,7 +223,7 @@ $Original log: LaRCsim.c,v $
 --------------------------------------------------------------------------*/
 
 #include <sys/types.h>
-#include <sys/stat.h>
+/* #include <sys/stat.h> */
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
@@ -240,8 +240,8 @@ $Original log: LaRCsim.c,v $
 #include "ls_aux.h"
 #include "ls_model.h"
 #include "ls_init.h"
-#include "../flight.h"
-#include "../../Aircraft/aircraft.h"
+#include <Flight/flight.h>
+#include <Aircraft/aircraft.h>
 
 /* global variable declarations */
 
@@ -496,11 +496,11 @@ void ls_loop( SCALAR dt, int initialize ) {
 
 
 int ls_cockpit( void ) {
-    struct fgCONTROLS *c;
+    fgCONTROLS *c;
 
     sim_control_.paused = 0;
 
-    c = &current_aircraft.controls;
+    c = current_aircraft.controls;
 
     Lat_control = FG_Aileron;
     Long_control = FG_Elevator;
@@ -562,7 +562,7 @@ int fgLaRCsimUpdate(int multiloop) {
 
 
 /* Convert from the fgFLIGHT struct to the LaRCsim generic_ struct */
-int fgFlight_2_LaRCsim (struct fgFLIGHT *f) {
+int fgFlight_2_LaRCsim (fgFLIGHT *f) {
     Mass =      FG_Mass;
     I_xx =      FG_I_xx;
     I_yy =      FG_I_yy;
@@ -738,7 +738,7 @@ int fgFlight_2_LaRCsim (struct fgFLIGHT *f) {
 
 
 /* Convert from the LaRCsim generic_ struct to the fgFLIGHT struct */
-int fgLaRCsim_2_Flight (struct fgFLIGHT *f) {
+int fgLaRCsim_2_Flight (fgFLIGHT *f) {
     FG_Mass =   Mass;
     FG_I_xx =   I_xx;
     FG_I_yy =   I_yy;
@@ -915,6 +915,17 @@ int fgLaRCsim_2_Flight (struct fgFLIGHT *f) {
 /* Flight Gear Modification Log
  *
  * $Log$
+ * Revision 1.16  1998/02/07 15:29:38  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
+ * Revision 1.15  1998/01/22 22:03:47  curt
+ * Removed #include <sys/stat.h>
+ *
+ * Revision 1.14  1998/01/19 19:27:04  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.13  1998/01/19 18:40:26  curt
  * Tons of little changes to clean up the code and to remove fatal errors
  * when building with the c++ compiler.