Merge branch 'jmt/track-bug' into next

[flightgear.git] / src / Network / opengc.cxx

diff --git a/src/Network/opengc.cxx b/src/Network/opengc.cxx
index 8d46dcffeac9448bef8dff67bc6a7de3886b14cf..6cdb5a4f55566fa6344739eef2a8f46774a4f398 100644 (file)
--- a/src/Network/opengc.cxx
+++ b/src/Network/opengc.cxx
@@ -28,6 +28,10 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
 
@@ -38,7 +42,7 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 
-SG_USING_STD(vector);
+using std::vector;
 
 FGOpenGC::FGOpenGC() : 
        press_node(fgGetNode("/environment/pressure-inhg[0]", true)),
@@ -46,22 +50,26 @@ FGOpenGC::FGOpenGC() :
        wind_dir_node(fgGetNode("/environment/wind-from-heading-deg[0]", true)),
        wind_speed_node(fgGetNode("/environment/wind-speed-kt[0]", true)),
        magvar_node(fgGetNode("/environment/magnetic-variation-deg[0]", true)),
-       p_left_aileron(fgGetNode("surface-positions/left-aileron-pos-norm", true)),
-       p_right_aileron(fgGetNode("surface-positions/right-aileron-pos-norm", true)),
-       p_elevator(fgGetNode("surface-positions/elevator-pos-norm", true)),
-       p_elevator_trim(fgGetNode("surface-positions/elevator_trim-pos-norm", true)),
-       p_rudder(fgGetNode("surface-positions/rudder-pos-norm", true)),
-       p_flaps(fgGetNode("surface-positions/flap-pos-norm", true)),
-       p_flaps_cmd(fgGetNode("/controls/flight/flaps", true)),
-       p_alphadot(fgGetNode("/fdm/jsbsim/aero/alphadot-rad_sec[0]", true)),
-       p_betadot(fgGetNode("/fdm/jsbsim/aero/betadot-rad_sec[0]", true)),
        p_latitude(fgGetNode("/position/latitude-deg", true)),  
        p_longitude(fgGetNode("/position/longitude-deg", true)),
        p_elev_node(fgGetNode("/position/altitude-ft", true)),
        p_altitude_agl(fgGetNode("/position/altitude-agl-ft", true)),
+       p_pitch(fgGetNode("/orientation/pitch-deg[0]", true)),
+       p_bank(fgGetNode("/orientation/roll-deg[0]", true)),
+       p_heading(fgGetNode("/orientation/heading-magnetic-deg[0]", true)),
+       p_yaw(fgGetNode("/fdm/jsbsim/aero/beta-rad[0]", true)),
+       p_yaw_rate(fgGetNode("/fdm/jsbsim/aero/betadot-rad_sec[0]", true)),
        vel_kcas(fgGetNode("/velocities/airspeed-kt[0]", true)),
        p_vvi(fgGetNode("/velocities/vertical-speed-fps[0]", true )),
        p_mach(fgGetNode("/velocities/mach[0]", true )),
+       p_left_aileron(fgGetNode("surface-positions/left-aileron-pos-norm", true)),
+       p_right_aileron(fgGetNode("surface-positions/right-aileron-pos-norm", true)),
+       p_elevator(fgGetNode("surface-positions/elevator-pos-norm", true)),
+       p_elevator_trim(fgGetNode("surface-positions/elevator_trim-pos-norm", true)),
+       p_rudder(fgGetNode("surface-positions/rudder-pos-norm", true)),
+       p_flaps(fgGetNode("surface-positions/flap-pos-norm", true)),
+       p_flaps_cmd(fgGetNode("/controls/flight/flaps", true)),
+       p_park_brake(fgGetNode("/controls/gear/brake-parking", true)),  
        egt0_node(fgGetNode("/engines/engine/EGT_degC[0]", true)),
        egt1_node(fgGetNode("/engines/engine[1]/EGT_degC[0]", true)),
        egt2_node(fgGetNode("/engines/engine[2]/EGT_degC[0]", true)),
@@ -90,13 +98,8 @@ FGOpenGC::FGOpenGC() :
        tank5_node(fgGetNode("/consumables/fuel/tank[5]/level-lb[0]", true)),
        tank6_node(fgGetNode("/consumables/fuel/tank[6]/level-lb[0]", true)),
        tank7_node(fgGetNode("/consumables/fuel/tank[7]/level-lb[0]", true)),
-       p_park_brake(fgGetNode("/controls/gear/brake-parking", true)),  
-       p_pitch(fgGetNode("/orientation/pitch-deg[0]", true)),
-       p_bank(fgGetNode("/orientation/roll-deg[0]", true)),
-       p_heading(fgGetNode("/orientation/heading-magnetic-deg[0]", true)),
-       p_yaw(fgGetNode("/fdm/jsbsim/aero/beta-rad[0]", true)),
-       p_yaw_rate(fgGetNode("/fdm/jsbsim/aero/betadot-rad_sec[0]", true))
-       
+       p_alphadot(fgGetNode("/fdm/jsbsim/aero/alphadot-rad_sec[0]", true)),
+       p_betadot(fgGetNode("/fdm/jsbsim/aero/betadot-rad_sec[0]", true))
 {
 }