Turned "struct fgCONTROLS" into a class, with inlined accessor functions.

[flightgear.git] / FDM / LaRCsim.cxx

diff --git a/FDM/LaRCsim.cxx b/FDM/LaRCsim.cxx
index ede3e99f6f55c2bae69f27fa7078db0349a760f8..3230274f3785c76f8cb4cb4dd546c873c4c97ef0 100644 (file)
--- a/FDM/LaRCsim.cxx
+++ b/FDM/LaRCsim.cxx
@@ -25,7 +25,7 @@
 #include "LaRCsim.hxx"
 
 #include <Aircraft/aircraft.hxx>
-#include <Controls/controls.h>
+#include <Controls/controls.hxx>
 #include <Flight/flight.hxx>
 #include <Flight/LaRCsim/ls_cockpit.h>
 #include <Flight/LaRCsim/ls_generic.h>
@@ -78,6 +78,14 @@ int fgLaRCsimUpdate(fgFLIGHT *f, int multiloop) {
 
 // Convert from the fgFLIGHT struct to the LaRCsim generic_ struct
 int fgFlight_2_LaRCsim (fgFLIGHT *f) {
+
+    Lat_control = controls.get_aileron();
+    Long_control = controls.get_elevator();
+    Long_trim = controls.get_elevator_trim();
+    Rudder_pedal = controls.get_rudder();
+    Throttle_pct = controls.get_throttle( 0 );
+    Brake_pct = controls.get_brake( 0 );
+
     Mass =      FG_Mass;
     I_xx =      FG_I_xx;
     I_yy =      FG_I_yy;
@@ -254,16 +262,6 @@ int fgFlight_2_LaRCsim (fgFLIGHT *f) {
 
 // Convert from the LaRCsim generic_ struct to the fgFLIGHT struct
 int fgLaRCsim_2_Flight (fgFLIGHT *f) {
-    fgCONTROLS *c;
-
-    c = current_aircraft.controls;
-
-    Lat_control = FG_Aileron;
-    Long_control = FG_Elevator;
-    Long_trim = FG_Elev_Trim;
-    Rudder_pedal = FG_Rudder;
-    Throttle_pct = FG_Throttle[0];
-
     FG_Mass =   Mass;
     FG_I_xx =   I_xx;
     FG_I_yy =   I_yy;
@@ -439,6 +437,12 @@ int fgLaRCsim_2_Flight (fgFLIGHT *f) {
 
 
 // $Log$
+// Revision 1.3  1998/10/25 14:08:43  curt
+// Turned "struct fgCONTROLS" into a class, with inlined accessor functions.
+//
+// Revision 1.2  1998/10/17 01:34:11  curt
+// C++ ifying ...
+//
 // Revision 1.1  1998/10/17 00:43:58  curt
 // Initial revision.
 //