Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Systems / system_mgr.cxx

diff --git a/src/Systems/system_mgr.cxx b/src/Systems/system_mgr.cxx
index 9d945a5849f3adeaed68acea0f3cfedcc25dbc86..ce43ddbf847a790bf6bdd78aec248fd2f9ef33fc 100644 (file)
--- a/src/Systems/system_mgr.cxx
+++ b/src/Systems/system_mgr.cxx
@@ -29,48 +29,46 @@
 
 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&) {
-            SG_LOG( SG_ALL, SG_ALERT, "Failed to load systems system model: "
+            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;
@@ -94,7 +92,7 @@ bool FGSystemMgr::build ()
             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;
         }