X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Finstrument_mgr.cxx;h=57f6a02a368c88d6468ed19366420381269d19a6;hb=68c71d5787f2a0309e35c3e05939950113618cb7;hp=121df9bd8b6065fecaf8dfe292b535b681b64de8;hpb=6110139197f594f7703cb52235f1de63feb68745;p=flightgear.git

diff --git a/src/Instrumentation/instrument_mgr.cxx b/src/Instrumentation/instrument_mgr.cxx
index 121df9bd8..57f6a02a3 100644
--- a/src/Instrumentation/instrument_mgr.cxx
+++ b/src/Instrumentation/instrument_mgr.cxx
@@ -19,7 +19,6 @@
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
 #include <Main/util.hxx>
-#include <Instrumentation/HUD/HUD.hxx>
 
 #include "instrument_mgr.hxx"
 #include "adf.hxx"
@@ -43,26 +42,27 @@
 #include "turn_indicator.hxx"
 #include "vertical_speed_indicator.hxx"
 #include "inst_vertical_speed_indicator.hxx"
-#include "wxradar.hxx"
 #include "tacan.hxx"
 #include "mk_viii.hxx"
 #include "mrg.hxx"
-#include "groundradar.hxx"
-#include "agradar.hxx"
 #include "rad_alt.hxx"
 #include "tcas.hxx"
-#include "NavDisplay.hxx"
 
 FGInstrumentMgr::FGInstrumentMgr () :
   _explicitGps(false)
 {    
-    globals->add_subsystem("hud", new HUD, SGSubsystemMgr::DISPLAY);
 }
 
 FGInstrumentMgr::~FGInstrumentMgr ()
 {
 }
 
+SGSubsystem::InitStatus FGInstrumentMgr::incrementalInit()
+{
+  init();
+  return INIT_DONE;
+}
+
 void FGInstrumentMgr::init()
 {
   SGPropertyNode_ptr config_props = new SGPropertyNode;
@@ -107,20 +107,6 @@ void FGInstrumentMgr::init()
   SGSubsystemGroup::init();
 }
 
-void FGInstrumentMgr::reinit()
-{  
-// delete all our instrument
-  for (unsigned int i=0; i<_instruments.size(); ++i) {
-    const std::string& nm(_instruments[i]);
-    SGSubsystem* instr = get_subsystem(nm);
-    instr->unbind();
-    remove_subsystem(nm);
-    delete instr;
-  }
-  
-  init();
-}
-
 bool FGInstrumentMgr::build (SGPropertyNode* config_props)
 {
     for ( int i = 0; i < config_props->nChildren(); ++i ) {
@@ -134,7 +120,6 @@ bool FGInstrumentMgr::build (SGPropertyNode* config_props)
         if (index > 0)
             subsystemname << '['<< index << ']';
         string id = subsystemname.str();
-        _instruments.push_back(id);
       
         if ( name == "adf" ) {
             set_subsystem( id, new ADF( node ), 0.15 );
@@ -199,9 +184,6 @@ bool FGInstrumentMgr::build (SGPropertyNode* config_props)
         } else if ( name == "vertical-speed-indicator" ) {
             set_subsystem( id, new VerticalSpeedIndicator( node ) );
 
-        } else if ( name == "radar" ) {
-            set_subsystem( id, new wxRadarBg ( node ) );
-
         } else if ( name == "inst-vertical-speed-indicator" ) {
             set_subsystem( id, new InstVerticalSpeedIndicator( node ) );
 
@@ -214,27 +196,30 @@ bool FGInstrumentMgr::build (SGPropertyNode* config_props)
         } else if ( name == "master-reference-gyro" ) {
             set_subsystem( id, new MasterReferenceGyro( node ) );
 
-        } else if ( name == "groundradar" ) {
-            set_subsystem( id, new GroundRadar( node ) );
-
-        } else if ( name == "air-ground-radar" ) {
-            set_subsystem( id, new agRadar( node ) );
-
+        } else if (( name == "groundradar" ) ||
+                   ( name == "radar" ) ||
+                   ( name == "air-ground-radar" ) ||
+                   ( name == "navigation-display" ))
+        {
+        // these instruments are handled by the CockpitDisplayManager
+        // catch them here so we can still warn about bogus names in
+        // the instruments file
+          continue;
         } else if ( name == "radar-altimeter" ) {
-            set_subsystem( id, new radAlt( node ) );
+            set_subsystem( id, new RadarAltimeter( node ) );
 
         } else if ( name == "tcas" ) {
             set_subsystem( id, new TCAS( node ), 0.2);
-        
-        } else if ( name == "navigation-display" ) {
-            set_subsystem( id, new NavDisplay( node ) );
             
         } else {
             SG_LOG( SG_ALL, SG_ALERT, "Unknown top level section: "
                     << name );
             return false;
         }
-    }
+      
+      // only push to our array if we actually built an insturment
+        _instruments.push_back(id);
+    } // of instruments iteration
     return true;
 }