fix NAV receiver vs GPS bugs

[flightgear.git] / src / Instrumentation / kr_87.hxx

diff --git a/src/Instrumentation/kr_87.hxx b/src/Instrumentation/kr_87.hxx
index 2be8abc77f1504c4c0c6f548cb0bd30f66b95a84..e59beba7b729cc2b6a340f000a8b69ff95b84f13 100644 (file)
--- a/src/Instrumentation/kr_87.hxx
+++ b/src/Instrumentation/kr_87.hxx
@@ -34,16 +34,17 @@
 #include <Navaids/navlist.hxx>
 #include <Sound/morse.hxx>
 
+class SGSampleGroup;
 
 class FGKR_87 : public SGSubsystem
 {
     FGMorse morse;
 
-    SGPropertyNode *lon_node;
-    SGPropertyNode *lat_node;
-    SGPropertyNode *alt_node;
-    SGPropertyNode *bus_power;
-    SGPropertyNode *serviceable;
+    SGPropertyNode_ptr lon_node;
+    SGPropertyNode_ptr lat_node;
+    SGPropertyNode_ptr alt_node;
+    SGPropertyNode_ptr bus_power;
+    SGPropertyNode_ptr serviceable;
 
     bool need_update;
 
@@ -59,9 +60,7 @@ class FGKR_87 : public SGSubsystem
     double effective_range;
     double dist;
     double heading;
-    double x;
-    double y;
-    double z;
+    SGVec3d xyz;
     double goal_needle_deg;
     double et_flash_time;
 
@@ -106,6 +105,8 @@ class FGKR_87 : public SGSubsystem
     // internal periodic station search timer
     double _time_before_search_sec;
 
+    SGSharedPtr<SGSampleGroup> _sgr;
+
 public:
 
     FGKR_87( SGPropertyNode *node );