a small cleanup and make Windows simple_mmap function return the proper value if...

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

diff --git a/src/Systems/system_mgr.cxx b/src/Systems/system_mgr.cxx
index 21bf3f5cf0bb7f51141a516af8f5af0fd726f139..3a706d8ca9cb2724415b2efddc34472c07775940 100644 (file)
--- a/src/Systems/system_mgr.cxx
+++ b/src/Systems/system_mgr.cxx
@@ -3,9 +3,14 @@
 //
 // This file is in the Public Domain and comes with no warranty.
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #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>
@@ -20,14 +25,10 @@
 #include "pitot.hxx"
 #include "static.hxx"
 #include "vacuum.hxx"
-#include "submodel.hxx"
 
 
 FGSystemMgr::FGSystemMgr ()
 {
-    set_subsystem( "electrical", new FGElectricalSystem );
-    set_subsystem( "submodel", new SubmodelSystem() );
-
     config_props = new SGPropertyNode;
 
     SGPropertyNode *path_n = fgGetNode("/sim/systems/path");
@@ -45,7 +46,7 @@ FGSystemMgr::FGSystemMgr ()
                 enabled = true;
             } else {
                 SG_LOG( SG_ALL, SG_ALERT,
-                        "Detected an internal inconsistancy in the systems");
+                        "Detected an internal inconsistency in the systems");
                 SG_LOG( SG_ALL, SG_ALERT,
                         " system specification file.  See earlier errors for" );
                 SG_LOG( SG_ALL, SG_ALERT,
@@ -80,7 +81,10 @@ bool FGSystemMgr::build ()
         string name = node->getName();
         std::ostringstream temp;
         temp << i;
-        if ( name == "pitot" ) {
+        if ( name == "electrical" ) {
+            set_subsystem( "electrical" + temp.str(),
+                           new FGElectricalSystem( node ) );
+        } else if ( name == "pitot" ) {
             set_subsystem( "system" + temp.str(), 
                            new PitotSystem( node ) );
         } else if ( name == "static" ) {