fg_home( "" ),
time_params( NULL ),
ephem( NULL ),
- matlib( NULL ),
route_mgr( NULL ),
ATIS_mgr( NULL ),
controls( NULL ),
{
SGPath dirPath(path);
if (!dirPath.exists()) {
- SG_LOG(SG_GENERAL, SG_WARN, "aircraft path not found:" << path);
+ SG_LOG(SG_GENERAL, SG_ALERT, "aircraft path not found:" << path);
return;
}
+
+ SGPath acSubdir(dirPath);
+ acSubdir.append("Aircraft");
+ 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);
}
}
+static void treeClearAliases(SGPropertyNode* nd)
+{
+ if (nd->isAlias()) {
+ nd->unalias();
+ }
+
+ for (int i=0; i<nd->nChildren(); ++i) {
+ SGPropertyNode* cp = nd->getChild(i);
+ treeClearAliases(cp);
+ }
+}
+
void
FGGlobals::resetPropertyRoot()
{
orientHeading.clear();
orientRoll.clear();
+ // clear aliases so ref-counts are accurate when dumped
+ treeClearAliases(props);
+
SG_LOG(SG_GENERAL, SG_INFO, "root props refcount:" << props.getNumRefs());
treeDumpRefCounts(0, props);
void FGGlobals::set_matlib( SGMaterialLib *m )
{
- if (matlib)
- delete matlib;
matlib = m;
}