Removes some references (in comments / disabled code) to Point3D

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

diff --git a/src/Systems/system_mgr.cxx b/src/Systems/system_mgr.cxx
index 682293ef67c00504c72be5f4adc61e1ba2fdf691..0ca9efb7a1b0eca305ab0b23372ddb56762231d9 100644 (file)
--- a/src/Systems/system_mgr.cxx
+++ b/src/Systems/system_mgr.cxx
@@ -10,6 +10,7 @@
 #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>
@@ -28,20 +29,19 @@
 
 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 "
                 << config.str() );
         try {
             readProperties( config.str(), config_props );
 
-            if ( build() ) {
+            if ( build(config_props) ) {
                 enabled = true;
             } else {
                 SG_LOG( SG_ALL, SG_ALERT,
@@ -52,7 +52,7 @@ FGSystemMgr::FGSystemMgr ()
                         " details.");
                 exit(-1);
             }        
-        } catch (const sg_exception& exc) {
+        } catch (const sg_exception&) {
             SG_LOG( SG_ALL, SG_ALERT, "Failed to load systems system model: "
                     << config.str() );
         }
@@ -62,14 +62,13 @@ FGSystemMgr::FGSystemMgr ()
                 "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;