fix another crash at the poles

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

diff --git a/src/Instrumentation/tacan.hxx b/src/Instrumentation/tacan.hxx
old mode 100755 (executable)
new mode 100644 (file)
index 7c8873a..b48057f
--- a/src/Instrumentation/tacan.hxx
+++ b/src/Instrumentation/tacan.hxx
@@ -40,23 +40,19 @@ public:
     virtual ~TACAN ();
 
     virtual void init ();
+    virtual void reinit ();
     virtual void update (double delta_time_sec);
 
 private:
 
-    void search (double frequency, double longitude_rad,
-                 double latitude_rad, double altitude_m);
-    double searchChannel (const string& channel);
+    void search (double frequency, const SGGeod& pos);
+  double searchChannel (const std::string& channel);
     void valueChanged (SGPropertyNode *);
 
-    string _name;
+    std::string _name;
     unsigned int _num;
 
-    SGPropertyNode_ptr _longitude_node;
-    SGPropertyNode_ptr _latitude_node;
-    SGPropertyNode_ptr _altitude_node;
     SGPropertyNode_ptr _heading_node;
-    SGPropertyNode_ptr _yaw_node;
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _electrical_node;
     SGPropertyNode_ptr _frequency_node;
@@ -85,7 +81,7 @@ private:
     SGPropertyNode_ptr _mp_callsign_node;              // FIXME
 
     bool _new_frequency;
-    string _channel;
+    std::string _channel;
     double _last_distance_nm;
     double _frequency_mhz;
     double _time_before_search_sec;
@@ -96,18 +92,15 @@ private:
     SGVec3d _transmitter;
     SGGeod _transmitter_pos;
     double _transmitter_range_nm;
-    double _transmitter_bearing_deg;
     double _transmitter_bias;
-    string _transmitter_name;
-    string _transmitter_ident;
+    std::string _transmitter_name;
+    std::string _transmitter_ident;
 
-    double _mobile_lat, _mobile_lon;
-    double _mobile_elevation_ft;
+    SGGeod _mobilePos;
     double _mobile_range_nm;
-    double _mobile_bearing_deg;
     double _mobile_bias;
-    string _mobile_name;
-    string _mobile_ident;
+    std::string _mobile_name;
+    std::string _mobile_ident;
 
     int _listener_active;
 };