- Added "SG" prefix to sound classes that recently moved to SimGear.

[flightgear.git] / src / FDM / LaRCsim.cxx

diff --git a/src/FDM/LaRCsim.cxx b/src/FDM/LaRCsim.cxx
index b53ba890ab39e75fbd7c82d2fa975e35c3b7a344..3a27172e4bf7ad92f3bcd735c7f73143e24b32b1 100644 (file)
--- a/src/FDM/LaRCsim.cxx
+++ b/src/FDM/LaRCsim.cxx
@@ -24,19 +24,18 @@
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
+#include <simgear/scene/model/location.hxx>
+#include <simgear/scene/model/placement.hxx>
 
-
-#include <Main/fg_props.hxx>
 #include <Aircraft/aircraft.hxx>
 #include <Controls/controls.hxx>
-#include <Model/model.hxx>
-#include <Main/location.hxx>
 #include <FDM/flight.hxx>
 #include <FDM/LaRCsim/ls_cockpit.h>
 #include <FDM/LaRCsim/ls_generic.h>
 #include <FDM/LaRCsim/ls_interface.h>
 #include <FDM/LaRCsimIC.hxx>
 #include <FDM/UIUCModel/uiuc_aircraft.h>
+#include <Main/fg_props.hxx>
 #include <Model/acmodel.hxx>
 
 #include "IO360.hxx"
@@ -113,19 +112,19 @@ void FGLaRCsim::update( double dt ) {
 
        // Fake control-surface positions
        fgSetDouble("/surface-positions/flap-pos-norm",
-                   fgGetDouble("/controls/flaps"));
+                   fgGetDouble("/controls/flight/flaps"));
                                // FIXME: ignoring trim
        fgSetDouble("/surface-positions/elevator-pos-norm",
-                   fgGetDouble("/controls/elevator"));
+                   fgGetDouble("/controls/flight/elevator"));
                                // FIXME: ignoring trim
        fgSetDouble("/surface-positions/left-aileron-pos-norm",
-                   fgGetDouble("/controls/aileron"));
+                   fgGetDouble("/controls/flight/aileron"));
                                // FIXME: ignoring trim
        fgSetDouble("/surface-positions/right-aileron-pos-norm",
-                   -1 * fgGetDouble("/controls/aileron"));
+                   -1 * fgGetDouble("/controls/flight/aileron"));
                                // FIXME: ignoring trim
        fgSetDouble("/surface-positions/rudder-pos-norm",
-                   fgGetDouble("/controls/rudder"));
+                   fgGetDouble("/controls/flight/rudder"));
 
        // copy engine state values onto "bus"
        fgSetDouble("/engines/engine/rpm", eng.get_RPM());
@@ -571,7 +570,7 @@ bool FGLaRCsim::copy_from_LaRCsim() {
             globals->get_controls()->set_rudder(Rudder_pedal);
             //   controls.set_rudder(Rudder_pedal);
         }
-       if (Throttle_pct_input) {
+       if (pilot_throttle_no) {
             globals->get_controls()->set_throttle(0,Throttle_pct);
             //   controls.set_throttle(0,Throttle_pct);
         }