From f38c88b762bc6c317669e8e0b00a92b09ee4671a Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Wed, 16 Oct 2002 02:02:39 +0000
Subject: [PATCH] Fix an init order bug and do some minor cleanups.

---
 src/Cockpit/dme.cxx           |  2 --
 src/Cockpit/kr_87.cxx         |  2 --
 src/Cockpit/kt_70.cxx         |  1 -
 src/Cockpit/marker_beacon.cxx |  3 ---
 src/Cockpit/navcom.cxx        | 17 +++++++----------
 5 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/Cockpit/dme.cxx b/src/Cockpit/dme.cxx
index b6e5fbe41..bc00b0f51 100644
--- a/src/Cockpit/dme.cxx
+++ b/src/Cockpit/dme.cxx
@@ -99,8 +99,6 @@ FGDME::~FGDME()
 void
 FGDME::init ()
 {
-    search();
-    update(0);			// FIXME: use dt
 }
 
 void
diff --git a/src/Cockpit/kr_87.cxx b/src/Cockpit/kr_87.cxx
index aef0736de..67a0586db 100644
--- a/src/Cockpit/kr_87.cxx
+++ b/src/Cockpit/kr_87.cxx
@@ -114,8 +114,6 @@ FGKR_87::~FGKR_87() {
 
 void FGKR_87::init () {
     morse.init();
-
-    update(0);			// FIXME: use dt
 }
 
 
diff --git a/src/Cockpit/kt_70.cxx b/src/Cockpit/kt_70.cxx
index 4124ffef8..652eb3c25 100644
--- a/src/Cockpit/kt_70.cxx
+++ b/src/Cockpit/kt_70.cxx
@@ -64,7 +64,6 @@ FGKT_70::~FGKT_70() { }
 
 
 void FGKT_70::init () {
-    update(0);			// FIXME: use dt
 }
 
 
diff --git a/src/Cockpit/marker_beacon.cxx b/src/Cockpit/marker_beacon.cxx
index 941d1e2b4..8f0475914 100644
--- a/src/Cockpit/marker_beacon.cxx
+++ b/src/Cockpit/marker_beacon.cxx
@@ -104,9 +104,6 @@ FGMarkerBeacon::init ()
     morse.init();
     beacon.init();
     blink.stamp();
-
-    search();
-    update(0);			// FIXME: use dt
 }
 
 
diff --git a/src/Cockpit/navcom.cxx b/src/Cockpit/navcom.cxx
index 6a1adfca4..665f8b3bc 100644
--- a/src/Cockpit/navcom.cxx
+++ b/src/Cockpit/navcom.cxx
@@ -90,9 +90,13 @@ FGNavCom::init ()
 {
     morse.init();
 
-    search();
-
-    update(0);			// FIXME: use dt
+    // We assume that index is valid now (it must be set before init()
+    // is called.)
+    char propname[256];
+    sprintf( propname, "/systems/electrical/outputs/navcom[%d]", index );
+    // default to true in case no electrical system defined.
+    fgSetDouble( propname, 60.0 );
+    bus_power = fgGetNode( propname, true );
 }
 
 void
@@ -165,13 +169,6 @@ FGNavCom::bind ()
     fgTie( propname, this, &FGNavCom::get_nav_gs_needle_deflection );
 
     // end of binding
-
-    // We know index is valid now so lets bind to the bus property
-    // here.
-    sprintf( propname, "/systems/electrical/outputs/navcom[%d]", index );
-    // default to true in case no electrical system defined.
-    fgSetDouble( propname, 60.0 );
-    bus_power = fgGetNode( propname, true );
 }
 
 
-- 
2.39.5