X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FYASim%2FYASim.cxx;h=88e2ed60583e855e2598bdedae5558530a3a1be8;hb=5161029fc5394e305defe2260ab5a12c47249433;hp=b2906f152e60bf66c01c2b2d333bc43a0908db9f;hpb=0ff6c68c013f30d0786ba991e80e907508cc6ad9;p=flightgear.git

diff --git a/src/FDM/YASim/YASim.cxx b/src/FDM/YASim/YASim.cxx
index b2906f152..88e2ed605 100644
--- a/src/FDM/YASim/YASim.cxx
+++ b/src/FDM/YASim/YASim.cxx
@@ -23,8 +23,9 @@
 
 using namespace yasim;
 
-static const float RAD2DEG = 180/3.14159265358979323846;
-static const float PI2 = 3.14159265358979323846*2;
+static const float YASIM_PI = 3.14159265358979323846;
+static const float RAD2DEG = 180/YASIM_PI;
+static const float PI2 = YASIM_PI*2;
 static const float RAD2RPM = 9.54929658551;
 static const float M2FT = 3.2808399;
 static const float FT2M = 0.3048;
@@ -127,7 +128,6 @@ void YASim::init()
 
     // Superclass hook
     common_init();
-
     m->setCrashed(false);
 
     // Figure out the initial speed type
@@ -146,8 +146,7 @@ void YASim::init()
     }
 
     // Build a filename and parse it
-    SGPath f(globals->get_fg_root());
-    f.append("Aircraft-yasim");
+    SGPath f(fgGetString("/sim/aircraft-dir"));
     f.append(fgGetString("/sim/aero"));
     f.concat(".xml");
     readXML(f.str(), *_fdm);