#include <simgear/structure/exception.hxx>
#include <simgear/misc/sg_path.hxx>
#include <simgear/sg_inlines.h>
+#include <simgear/props/props_io.hxx>
#include <Main/fg_props.hxx>
#include <Main/globals.hxx>
FGSystemMgr::FGSystemMgr ()
{
- config_props = new SGPropertyNode;
+ SGPropertyNode_ptr config_props = new SGPropertyNode;
SGPropertyNode *path_n = fgGetNode("/sim/systems/path");
if (path_n) {
- SGPath config( globals->get_fg_root() );
- config.append( path_n->getStringValue() );
+ SGPath config = globals->resolve_aircraft_path(path_n->getStringValue());
- SG_LOG( SG_ALL, SG_INFO, "Reading systems from "
+ SG_LOG( SG_SYSTEMS, SG_INFO, "Reading systems from "
<< config.str() );
try {
readProperties( config.str(), config_props );
- if ( build() ) {
+ if ( build(config_props) ) {
enabled = true;
} else {
- SG_LOG( SG_ALL, SG_ALERT,
+ SG_LOG( SG_SYSTEMS, SG_ALERT,
"Detected an internal inconsistency in the systems");
- SG_LOG( SG_ALL, SG_ALERT,
+ SG_LOG( SG_SYSTEMS, SG_ALERT,
" system specification file. See earlier errors for" );
- SG_LOG( SG_ALL, SG_ALERT,
+ SG_LOG( SG_SYSTEMS, SG_ALERT,
" details.");
exit(-1);
}
- } catch (const sg_exception& exc) {
- SG_LOG( SG_ALL, SG_ALERT, "Failed to load systems system model: "
+ } catch (const sg_exception&) {
+ SG_LOG( SG_SYSTEMS, SG_ALERT, "Failed to load systems system model: "
<< config.str() );
}
} else {
- SG_LOG( SG_ALL, SG_WARN,
+ SG_LOG( SG_SYSTEMS, SG_WARN,
"No systems model specified for this model!");
}
- delete config_props;
}
FGSystemMgr::~FGSystemMgr ()
{
}
-bool FGSystemMgr::build ()
+bool FGSystemMgr::build (SGPropertyNode* config_props)
{
SGPropertyNode *node;
int i;
set_subsystem( "system" + temp.str(),
new VacuumSystem( node ) );
} else {
- SG_LOG( SG_ALL, SG_ALERT, "Unknown top level section: "
+ SG_LOG( SG_SYSTEMS, SG_ALERT, "Unknown top level section: "
<< name );
return false;
}