Remove an unneeded #include.

[flightgear.git] / src / Aircraft / aircraft.cxx

diff --git a/src/Aircraft/aircraft.cxx b/src/Aircraft/aircraft.cxx
index 9b667c8f7e842dd64d4e79fa5694486c5dc8bf9a..23da8375b5e2e743eb3b7922c184c12d406e4ac8 100644 (file)
--- a/src/Aircraft/aircraft.cxx
+++ b/src/Aircraft/aircraft.cxx
@@ -25,25 +25,20 @@
 #include <string.h>            // strdup
 
 #include <plib/ul.h>
-#include <plib/ssg.h>
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
-#include <simgear/misc/commands.hxx>
-#include <simgear/misc/exception.hxx>
+#include <simgear/structure/commands.hxx>
+#include <simgear/structure/exception.hxx>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/viewmgr.hxx>
-#include <Sound/fg_fx.hxx>
-#include <Sound/soundmgr.hxx>
 #include <Cockpit/panel.hxx>
 #include <Cockpit/hud.hxx>
 #include <Cockpit/panel_io.hxx>
 #include <Model/acmodel.hxx>
-#include <Autopilot/newauto.hxx>
-#include <Main/fgfs.hxx>
 
 #include "aircraft.hxx"
 
@@ -90,7 +85,7 @@ void fgAircraftOutputCurrent(fgAIRCRAFT *a) {
 // Show available aircraft types
 void fgReadAircraft(void) {
 
-   SGPropertyNode *aircraft_types = fgGetNode("/sim/aircraft-types", true);
+   // SGPropertyNode *aircraft_types = fgGetNode("/sim/aircraft-types", true);
 
    SGPath path( globals->get_fg_root() );
    path.append("Aircraft");
@@ -127,10 +122,8 @@ void fgReadAircraft(void) {
              SGPropertyNode *desc = node->getNode("description");
 
              if (desc) {
-#endif
-                SGPropertyNode *aircraft =
+                 SGPropertyNode *aircraft =
                                 aircraft_types->getChild(dire->d_name, 0, true);
-#if 0
 
                 aircraft->setStringValue(strdup(desc->getStringValue()));
              }
@@ -233,9 +226,9 @@ fgLoadAircraft (const SGPropertyNode * arg)
     //
     globals->get_viewmgr()->reinit();
     globals->get_controls()->reset_all();
-    globals->get_autopilot()->reset();
     globals->get_aircraft_model()->reinit();
     globals->get_subsystem("fx")->reinit();
+    globals->get_subsystem("xml-autopilot")->reinit();
 
     fgReInitSubsystems();