Add properties for raw axis and button values, for use

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

diff --git a/src/Systems/system_mgr.cxx b/src/Systems/system_mgr.cxx
index 4936ea63818fec9a43fe5ceaac56d9fb75ff18ed..252ce543875a03a29767b0bd47e29dbe4b224778 100644 (file)
--- a/src/Systems/system_mgr.cxx
+++ b/src/Systems/system_mgr.cxx
@@ -16,6 +16,7 @@
 #include <Main/globals.hxx>
 #include <Main/util.hxx>
 
+#include <cstdlib>
 #include <iostream>
 #include <string>
 #include <sstream>
@@ -34,10 +35,9 @@ FGSystemMgr::FGSystemMgr ()
     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 );
@@ -45,21 +45,21 @@ FGSystemMgr::FGSystemMgr ()
             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!");
     }
 
@@ -93,7 +93,7 @@ bool FGSystemMgr::build (SGPropertyNode* config_props)
             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;
         }