#include <Aircraft/controls.hxx>
#include <Airports/runways.hxx>
-#include <ATCDCL/ATISmgr.hxx>
#include <Autopilot/route_mgr.hxx>
#include <GUI/FGFontCache.hxx>
#include <GUI/gui.h>
time_params( NULL ),
ephem( NULL ),
route_mgr( NULL ),
- ATIS_mgr( NULL ),
controls( NULL ),
viewmgr( NULL ),
commands( SGCommandMgr::instance() ),
delete time_params;
set_matlib(NULL);
delete route_mgr;
- delete ATIS_mgr;
delete channel_options_list;
delete initial_waypoints;
delete fontcache;
// remove /sim/fg-root before writing to prevent hijacking
SGPropertyNode *n = fgGetNode("/sim", true);
- n->removeChild("fg-root", 0, false);
+ n->removeChild("fg-root", 0);
n = n->getChild("fg-root", 0, true);
n->setStringValue(fg_root.c_str());
n->setAttribute(SGPropertyNode::WRITE, false);
SGPath acSubdir(dirPath);
acSubdir.append("Aircraft");
- if (!acSubdir.exists()) {
- if (dirPath.file() == "Aircraft") {
- dirPath = dirPath.dir();
- SG_LOG(SG_GENERAL, SG_WARN, "Specified an aircraft-dir path ending in 'Aircraft':" << path
- << ", will instead use parent directory:" << dirPath);
- } else {
- SG_LOG(SG_GENERAL, SG_ALERT, "Aircraft-dir path '" << path <<
- "' does not contain an 'Aircraft' subdirectory, cross-aircraft paths will not resolve correctly.");
- }
+ if (acSubdir.exists()) {
+ SG_LOG(SG_GENERAL, SG_WARN, "Specified an aircraft-dir with an 'Aircraft' subdirectory:" << dirPath
+ << ", will instead use child directory:" << acSubdir);
+ dirPath = acSubdir;
}
std::string abspath = dirPath.realpath();
-
unsigned int index = fg_aircraft_dirs.size();
fg_aircraft_dirs.push_back(abspath);
// make aircraft dirs available to Nasal
SGPropertyNode* sim = fgGetNode("/sim", true);
- sim->removeChild("fg-aircraft", index, false);
+ sim->removeChild("fg-aircraft", index);
SGPropertyNode* n = sim->getChild("fg-aircraft", index, true);
n->setStringValue(abspath);
n->setAttribute(SGPropertyNode::WRITE, false);
// remove /sim/fg-root before writing to prevent hijacking
SGPropertyNode *n = props->getNode("/sim", true);
- n->removeChild("fg-root", 0, false);
+ n->removeChild("fg-root", 0);
n = n->getChild("fg-root", 0, true);
n->setStringValue(fg_root.c_str());
n->setAttribute(SGPropertyNode::WRITE, false);