Update 'magic' for more consistant cross platform padding.

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

diff --git a/src/Systems/static.cxx b/src/Systems/static.cxx
index 866845befdb8b0d19b0431c1fc0385c143859b80..f6cfa47b4be31831e46fd551bdc171a02baff1fe 100644 (file)
--- a/src/Systems/static.cxx
+++ b/src/Systems/static.cxx
@@ -8,8 +8,33 @@
 #include <Main/util.hxx>
 
 
-StaticSystem::StaticSystem ()
+StaticSystem::StaticSystem ( SGPropertyNode *node )
+    :
+    name("static"),
+    num(0)
 {
+    int i;
+    for ( i = 0; i < node->nChildren(); ++i ) {
+        SGPropertyNode *child = node->getChild(i);
+        string cname = child->getName();
+        string cval = child->getStringValue();
+        if ( cname == "name" ) {
+            name = cval;
+        } else if ( cname == "number" ) {
+            num = child->getIntValue();
+        } else {
+            SG_LOG( SG_SYSTEMS, SG_WARN, "Error in systems config logic" );
+            if ( name.length() ) {
+                SG_LOG( SG_SYSTEMS, SG_WARN, "Section = " << name );
+            }
+        }
+    }
+}
+
+StaticSystem::StaticSystem ( int i )
+{
+    name = "static";
+    num = i;
 }
 
 StaticSystem::~StaticSystem ()
@@ -19,9 +44,13 @@ StaticSystem::~StaticSystem ()
 void
 StaticSystem::init ()
 {
-    _serviceable_node = fgGetNode("/systems/static[0]/serviceable", true);
+    string branch;
+    branch = "/systems/" + name;
+
+    SGPropertyNode *node = fgGetNode(branch.c_str(), num, true );
+    _serviceable_node = node->getChild("serviceable", 0, true);
     _pressure_in_node = fgGetNode("/environment/pressure-inhg", true);
-    _pressure_out_node = fgGetNode("/systems/static[0]/pressure-inhg", true);
+    _pressure_out_node = node->getChild("pressure-inhg", 0, true);
 }
 
 void