And removal of the actual files.

diff --git a/src/Aircraft/aircraft.cxx b/src/Aircraft/aircraft.cxx
deleted file mode 100644 (file)
index 26b3502..0000000
--- a/src/Aircraft/aircraft.cxx
+++ /dev/null
@@ -1,193 +0,0 @@
-// aircraft.cxx -- various aircraft routines
-//
-// Written by Curtis Olson, started May 1997.
-//
-// Copyright (C) 1997  Curtis L. Olson  - http://www.flightgear.org/~curt
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
-// $Id$
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <cstdio>
-#include <cstring>             // strdup
-
-#include <plib/ul.h>
-
-#include <simgear/constants.h>
-#include <simgear/debug/logstream.hxx>
-#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>
-#include <Cockpit/hud.hxx>
-#include <Cockpit/panel_io.hxx>
-#include <Model/acmodel.hxx>
-#include <FDM/flightProperties.hxx>
-
-#include "aircraft.hxx"
-
-// Show available aircraft types
-void fgReadAircraft(void) {
-
-   // SGPropertyNode *aircraft_types = fgGetNode("/sim/aircraft-types", true);
-
-   SGPath path( globals->get_fg_root() );
-   path.append("Aircraft");
-
-   ulDirEnt* dire;
-   ulDir *dirp;
-
-   dirp = ulOpenDir(path.c_str());
-   if (dirp == NULL) {
-      SG_LOG( SG_AIRCRAFT, SG_ALERT, "Unable to open aircraft directory." );
-      ulCloseDir(dirp);
-      return;
-   }
-
-   while ((dire = ulReadDir(dirp)) != NULL) {
-      char *ptr;
-
-      if ((ptr = strstr(dire->d_name, "-set.xml")) && strlen(ptr) == 8) {
-
-          *ptr = '\0';
-#if 0
-          SGPath afile = path;
-          afile.append(dire->d_name);
-
-          SGPropertyNode root;
-          try {
-             readProperties(afile.str(), &root);
-          } catch (...) {
-             continue;
-          }
-
-          SGPropertyNode *node = root.getNode("sim");
-          if (node) {
-             SGPropertyNode *desc = node->getNode("description");
-
-             if (desc) {
-                 SGPropertyNode *aircraft =
-                                aircraft_types->getChild(dire->d_name, 0, true);
-
-                aircraft->setStringValue(strdup(desc->getStringValue()));
-             }
-          }
-#endif
-      }
-   }
-
-   ulCloseDir(dirp);
-
-   
-}
-
-bool
-fgLoadAircraft (const SGPropertyNode * arg)
-{
-    static const SGPropertyNode *master_freeze
-        = fgGetNode("/sim/freeze/master");
-
-    bool freeze = master_freeze->getBoolValue();
-    if ( !freeze ) {
-        fgSetBool("/sim/freeze/master", true);
-    }
-
-    // TODO:
-    //    remove electrical system
-    globals->get_subsystem("flight")->unbind();
-    
-    // Save the selected aircraft model since restoreInitialState
-    // will obverwrite it.
-    //
-    string aircraft = fgGetString("/sim/aircraft", "");
-    globals->restoreInitialState();
-
-    fgSetString("/sim/aircraft", aircraft.c_str());
-    fgSetString("/sim/panel/path", "Aircraft/c172p/Panels/c172-vfr-panel.xml");
-
-    if ( aircraft.size() > 0 ) {
-        SGPath aircraft_path(globals->get_fg_root());
-        aircraft_path.append("Aircraft");
-        aircraft_path.append(aircraft);
-        aircraft_path.concat("-set.xml");
-        SG_LOG(SG_INPUT, SG_INFO, "Reading default aircraft: " << aircraft
-               << " from " << aircraft_path.str());
-        try {
-            readProperties(aircraft_path.str(), globals->get_props());
-        } catch (const sg_exception &e) {
-            string message = "Error reading default aircraft: ";
-            message += e.getFormattedMessage();
-            SG_LOG(SG_INPUT, SG_ALERT, message);
-            exit(2);
-        }
-    } else {
-        SG_LOG(SG_INPUT, SG_ALERT, "No default aircraft specified");
-    }
-
-    // Initialize the (new) 2D panel.
-    //
-    string panel_path = fgGetString("/sim/panel/path",
-                                    "Aircraft/c172p/Panels/c172-vfr-panel.xml");
-
-    FGPanel *panel = fgReadPanel(panel_path);
-    if (panel == 0) {
-        SG_LOG( SG_INPUT, SG_ALERT,
-                "Error reading new panel from " << panel_path );
-    } else {
-        SG_LOG( SG_INPUT, SG_INFO, "Loaded new panel from " << panel_path );
-        globals->get_current_panel()->unbind();
-        delete globals->get_current_panel();
-        globals->set_current_panel( panel );
-        globals->get_current_panel()->init();
-        globals->get_current_panel()->bind();
-        globals->get_current_panel()->update(0);
-    }
-
-    globals->get_aircraft_model()->reinit();
-        
-    // TODO:
-    //    load new electrical system
-    //
-
-    // update our position based on current presets
-    fgInitPosition();
-
-    // Update the HUD
-    fgHUDInit();
-
-    SGTime *t = globals->get_time_params();
-    delete t;
-    t = fgInitTime();
-    globals->set_time_params( t );
-
-    globals->get_subsystem("xml-autopilot")->reinit();
-    fgReInitSubsystems();
-
-    if ( !freeze ) {
-        fgSetBool("/sim/freeze/master", false);
-    }
-
-    return true;
-}

diff --git a/src/Aircraft/aircraft.hxx b/src/Aircraft/aircraft.hxx
deleted file mode 100644 (file)
index 6c06c0c..0000000
--- a/src/Aircraft/aircraft.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-//*************************************************************************
-// aircraft.hxx -- define shared aircraft parameters
-//
-// Written by Curtis Olson, started May 1997.
-//
-// Copyright (C) 1997  Curtis L. Olson  - http://www.flightgear.org/~curt
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
-// $Id$
-//*************************************************************************/
-
-
-#ifndef _AIRCRAFT_HXX
-#define _AIRCRAFT_HXX
-                                 
-class SGPropertyNode;
-
-bool fgLoadAircraft (const SGPropertyNode * arg);
-
-#endif // _AIRCRAFT_HXX
-