the former weather radar is now a generic radar (weather and aircraft),

[flightgear.git] / src / Instrumentation / instrument_mgr.cxx

diff --git a/src/Instrumentation/instrument_mgr.cxx b/src/Instrumentation/instrument_mgr.cxx
index 9bc9172c58726e4d293065ce130c0cd2589d70c2..aaaba40b804a9309906cf821adc51586af9bc4b5 100644 (file)
--- a/src/Instrumentation/instrument_mgr.cxx
+++ b/src/Instrumentation/instrument_mgr.cxx
@@ -24,11 +24,9 @@
 #include "adf.hxx"
 #include "airspeed_indicator.hxx"
 #include "altimeter.hxx"
-#include "annunciator.hxx"
 #include "attitude_indicator.hxx"
 #include "clock.hxx"
 #include "dme.hxx"
-#include "encoder.hxx"
 #include "gps.hxx"
 #include "gsdi.hxx"
 #include "heading_indicator.hxx"
@@ -53,7 +51,6 @@
 
 FGInstrumentMgr::FGInstrumentMgr ()
 {
-    set_subsystem("annunciator", new Annunciator);
     set_subsystem("od_gauge", new FGODGauge, 1.0);
     set_subsystem("hud", new HUD);
 
@@ -123,7 +120,7 @@ bool FGInstrumentMgr::build ()
                            new DME( node ), 1.0 );
         } else if ( name == "encoder" ) {
             set_subsystem( "instrument" + temp.str(), 
-                           new Encoder( node ) );
+                           new Altimeter( node ) );
         } else if ( name == "gps" ) {
             set_subsystem( "instrument" + temp.str(), 
                            new GPS( node ), 0.45 );
@@ -166,7 +163,7 @@ bool FGInstrumentMgr::build ()
         } else if ( name == "vertical-speed-indicator" ) {
             set_subsystem( "instrument" + temp.str(), 
                            new VerticalSpeedIndicator( node ) );
-        } else if ( name == "wxradar" ) {
+        } else if ( name == "radar" ) {
             set_subsystem( "instrument" + temp.str(), 
                            new wxRadarBg ( node ), 0.5 );
         } else if ( name == "inst-vertical-speed-indicator" ) { // (TJ)