Fix an init order bug and do some minor cleanups.

[flightgear.git] / src / Cockpit / kr_87.cxx

diff --git a/src/Cockpit/kr_87.cxx b/src/Cockpit/kr_87.cxx
index 2c65a3823e84f1fe8863e1150feea021dc4b533d..67a0586dbf341ae13d53f58ab928e8525f079cc2 100644 (file)
--- a/src/Cockpit/kr_87.cxx
+++ b/src/Cockpit/kr_87.cxx
@@ -73,6 +73,7 @@ FGKR_87::FGKR_87() :
     lon_node(fgGetNode("/position/longitude-deg", true)),
     lat_node(fgGetNode("/position/latitude-deg", true)),
     alt_node(fgGetNode("/position/altitude-ft", true)),
+    bus_power(fgGetNode("/systems/electrical/outputs/adf", true)),
     need_update(true),
     valid(false),
     inrange(false),
@@ -103,32 +104,16 @@ FGKR_87::FGKR_87() :
     elapsed_timer(0.0),
     tmp_timer(0.0)
 {
-    SGPath path( globals->get_fg_root() );
-    SGPath term = path;
-    term.append( "Navaids/range.term" );
-    SGPath low = path;
-    low.append( "Navaids/range.low" );
-    SGPath high = path;
-    high.append( "Navaids/range.high" );
-
-    term_tbl = new SGInterpTable( term.str() );
-    low_tbl = new SGInterpTable( low.str() );
-    high_tbl = new SGInterpTable( high.str() );
 }
 
 
 // Destructor
 FGKR_87::~FGKR_87() {
-    delete term_tbl;
-    delete low_tbl;
-    delete high_tbl;
 }
 
 
 void FGKR_87::init () {
     morse.init();
-
-    update(0);                 // FIXME: use dt
 }
 
 
@@ -260,7 +245,7 @@ void FGKR_87::update( double dt ) {
     // Radio
     ////////////////////////////////////////////////////////////////////////
 
-    if ( power_btn ) {
+    if ( has_power() ) {
         // buttons
         if ( adf_btn == 0 ) {
             ant_mode = 1;