Merged in make system changes from Bob Kuehne <rpk@sgi.com>

[flightgear.git] / Controls / controls.c

diff --git a/Controls/controls.c b/Controls/controls.c
index 7d882c0f64facb93adf43ba5eed1944eda07ff7d..d5128ca41280a7b8e5c4a024895bc7adc6db7bbe 100644 (file)
--- a/Controls/controls.c
+++ b/Controls/controls.c
@@ -24,13 +24,13 @@
  **************************************************************************/
 
 
-#include "controls.h"
-#include "../aircraft/aircraft.h"
+#include <Controls/controls.h>
+#include <Aircraft/aircraft.h>
 
 
-void fgControlsInit() {
+void fgControlsInit( void ) {
     int i;
-    struct control_params *c;
+    struct fgCONTROLS *c;
     c = &current_aircraft.controls;
 
     FG_Elevator = 0.0;
@@ -46,7 +46,7 @@ void fgControlsInit() {
 
 
 void fgElevMove(double amt) {
-    struct control_params *c;
+    struct fgCONTROLS *c;
     c = &current_aircraft.controls;
 
     FG_Elevator += amt;
@@ -56,7 +56,7 @@ void fgElevMove(double amt) {
 }
 
 void fgElevSet(double pos) {
-    struct control_params *c;
+    struct fgCONTROLS *c;
     c = &current_aircraft.controls;
 
     FG_Elevator = pos;
@@ -66,7 +66,7 @@ void fgElevSet(double pos) {
 }
 
 void fgElevTrimMove(double amt) {
-    struct control_params *c;
+    struct fgCONTROLS *c;
     c = &current_aircraft.controls;
 
     FG_Elev_Trim += amt;
@@ -76,7 +76,7 @@ void fgElevTrimMove(double amt) {
 }
 
 void fgElevTrimSet(double pos) {
-    struct control_params *c;
+    struct fgCONTROLS *c;
     c = &current_aircraft.controls;
 
     FG_Elev_Trim = pos;
@@ -86,7 +86,7 @@ void fgElevTrimSet(double pos) {
 }
 
 void fgAileronMove(double amt) {
-    struct control_params *c;
+    struct fgCONTROLS *c;
     c = &current_aircraft.controls;
 
     FG_Aileron += amt;
@@ -96,7 +96,7 @@ void fgAileronMove(double amt) {
 }
 
 void fgAileronSet(double pos) {
-    struct control_params *c;
+    struct fgCONTROLS *c;
     c = &current_aircraft.controls;
 
     FG_Aileron = pos;
@@ -106,7 +106,7 @@ void fgAileronSet(double pos) {
 }
 
 void fgRudderMove(double amt) {
-    struct control_params *c;
+    struct fgCONTROLS *c;
     c = &current_aircraft.controls;
 
     FG_Rudder += amt;
@@ -116,7 +116,7 @@ void fgRudderMove(double amt) {
 }
 
 void fgRudderSet(double pos) {
-    struct control_params *c;
+    struct fgCONTROLS *c;
     c = &current_aircraft.controls;
 
     FG_Rudder = pos;
@@ -127,7 +127,7 @@ void fgRudderSet(double pos) {
 
 void fgThrottleMove(int engine, double amt) {
     int i;
-    struct control_params *c;
+    struct fgCONTROLS *c;
     c = &current_aircraft.controls;
 
     if ( engine == FG_Throttle_All ) {
@@ -147,7 +147,7 @@ void fgThrottleMove(int engine, double amt) {
 
 void fgThrottleSet(int engine, double pos) {
     int i;
-    struct control_params *c;
+    struct fgCONTROLS *c;
     c = &current_aircraft.controls;
 
     if ( engine == FG_Throttle_All ) {
@@ -167,7 +167,25 @@ void fgThrottleSet(int engine, double pos) {
 
 
 /* $Log$
-/* Revision 1.1  1997/05/31 19:24:04  curt
-/* Initial revision.
+/* Revision 1.6  1998/01/19 19:27:02  curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
 /*
+ * Revision 1.5  1998/01/19 18:40:22  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
+ * Revision 1.4  1997/12/10 22:37:41  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:01  curt
+ * Changed naming scheme of basic shared structures.
+ *
+ * Revision 1.2  1997/06/21 17:12:48  curt
+ * Capitalized subdirectory names.
+ *
+ * Revision 1.1  1997/05/31 19:24:04  curt
+ * Initial revision.
+ *
  */