X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2Fatlas.cxx;h=d5712f02e6fc75f93c44b6c746ec831a83e9909e;hb=fce2a53fc7cf5fb8e392a5e0570ad81f24e3ab0c;hp=f1c940c969d61e8e4fd6069b70b7fd08f4e1f89d;hpb=d279c394d739d11b0b0367dc4be220e7b0834c84;p=flightgear.git

diff --git a/src/Network/atlas.cxx b/src/Network/atlas.cxx
index f1c940c96..d5712f02e 100644
--- a/src/Network/atlas.cxx
+++ b/src/Network/atlas.cxx
@@ -24,6 +24,10 @@
 #  include "config.h"
 #endif
 
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/io/iochannel.hxx>
@@ -37,8 +41,15 @@
 #include "atlas.hxx"
 
 
-FGAtlas::FGAtlas() {
-  fdm = new FlightProperties;
+FGAtlas::FGAtlas() :
+  length(0),
+  fdm(new FlightProperties)
+{
+  _adf_freq        = fgGetNode("/instrumentation/adf/frequencies/selected-khz", true);
+  _nav1_freq       = fgGetNode("/instrumentation/nav/frequencies/selected-mhz", true);
+  _nav1_sel_radial = fgGetNode("/instrumentation/nav/radials/selected-deg", true);
+  _nav2_freq       = fgGetNode("/instrumentation/nav[1]/frequencies/selected-mhz", true);
+  _nav2_sel_radial = fgGetNode("/instrumentation/nav[1]/radials/selected-deg", true);
 }
 
 FGAtlas::~FGAtlas() {
@@ -68,18 +79,6 @@ static char calc_atlas_cksum(char *sentence) {
 // generate Atlas message
 bool FGAtlas::gen_message() {
     // cout << "generating atlas message" << endl;
-
-    static SGPropertyNode *adf_freq
-        = fgGetNode("/instrumentation/adf/frequencies/selected-khz", true);
-    static SGPropertyNode *nav1_freq
-        = fgGetNode("/instrumentation/nav/frequencies/selected-mhz", true);
-    static SGPropertyNode *nav1_sel_radial
-        = fgGetNode("/instrumentation/nav/radials/selected-deg", true);
-    static SGPropertyNode *nav2_freq
-        = fgGetNode("/instrumentation/nav[1]/frequencies/selected-mhz", true);
-    static SGPropertyNode *nav2_sel_radial
-        = fgGetNode("/instrumentation/nav[1]/radials/selected-deg", true);
-
     char rmc[256], gga[256], patla[256];
     char rmc_sum[10], gga_sum[10], patla_sum[10];
     char dir;
@@ -143,11 +142,11 @@ bool FGAtlas::gen_message() {
     sprintf( gga_sum, "%02X", calc_atlas_cksum(gga) );
 
     sprintf( patla, "PATLA,%.2f,%.1f,%.2f,%.1f,%.0f",
-	     nav1_freq->getDoubleValue(),
-	     nav1_sel_radial->getDoubleValue(),
-	     nav2_freq->getDoubleValue(),
-	     nav2_sel_radial->getDoubleValue(),
-	     adf_freq->getDoubleValue() );
+             _nav1_freq->getDoubleValue(),
+             _nav1_sel_radial->getDoubleValue(),
+             _nav2_freq->getDoubleValue(),
+             _nav2_sel_radial->getDoubleValue(),
+             _adf_freq->getDoubleValue() );
     sprintf( patla_sum, "%02X", calc_atlas_cksum(patla) );
 
     SG_LOG( SG_IO, SG_DEBUG, rmc );