Merge branch 'torsten/auto'

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

diff --git a/src/Aircraft/aircraft.cxx b/src/Aircraft/aircraft.cxx
index 724f659e18f51a156606b17fd35b880632a529c1..ba760a33ba96bdad702c2d2ab9818afb2499828b 100644 (file)
--- a/src/Aircraft/aircraft.cxx
+++ b/src/Aircraft/aircraft.cxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -24,8 +24,8 @@
 #  include "config.h"
 #endif
 
-#include <stdio.h>
-#include <string.h>            // strdup
+#include <cstdio>
+#include <cstring>             // strdup
 
 #include <plib/ul.h>
 
@@ -34,8 +34,10 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/structure/commands.hxx>
 #include <simgear/structure/exception.hxx>
+#include <simgear/sound/soundmgr_openal.hxx>
 
 #include <Main/globals.hxx>
+#include <Main/fg_init.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/viewmgr.hxx>
 #include <Cockpit/panel.hxx>
@@ -225,12 +227,9 @@ fgLoadAircraft (const SGPropertyNode * arg)
     t = fgInitTime();
     globals->set_time_params( t );
 
-    // Reinitialize some subsystems
-    //
     globals->get_viewmgr()->reinit();
     globals->get_controls()->reset_all();
     globals->get_aircraft_model()->reinit();
-    globals->get_subsystem("fx")->reinit();
     globals->get_subsystem("xml-autopilot")->reinit();
 
     fgReInitSubsystems();