Merge branch 'jmt/acinclude'

[flightgear.git] / src / Main / fg_props.cxx

diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index 31f4ae0dac7f5403c1d706349c7ba24d51ff7293..787e85ab57de008516347d9a8185b71919d17455 100644 (file)
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -31,6 +31,7 @@
 #include <simgear/magvar/magvar.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/scene/model/particles.hxx>
 #include <simgear/sound/soundmgr_openal.hxx>
 
 #include <Aircraft/aircraft.hxx>
@@ -236,6 +237,9 @@ setFreeze (bool f)
             smgr->resume();
         }
     }
+
+    // Pause the particle system
+    simgear::Particles::setFrozen(f);
 }
 
 
@@ -355,6 +359,18 @@ getHeadingMag ()
   return magheading;
 }
 
+/**
+ * Return the current track in degrees.
+ */
+static double
+getTrackMag ()
+{
+  double magtrack;
+  magtrack = current_aircraft.fdm_state->get_Track() - getMagVar();
+  if (magtrack < 0) magtrack += 360;
+  return magtrack;
+}
+
 static long
 getWarp ()
 {
@@ -514,6 +530,7 @@ FGProperties::bind ()
 
                                // Orientation
   fgTie("/orientation/heading-magnetic-deg", getHeadingMag);
+  fgTie("/orientation/track-magnetic-deg", getTrackMag);
 
   fgTie("/environment/magnetic-variation-deg", getMagVar);
   fgTie("/environment/magnetic-dip-deg", getMagDip);
@@ -543,6 +560,7 @@ FGProperties::unbind ()
 
                                // Orientation
   fgUntie("/orientation/heading-magnetic-deg");
+  fgUntie("/orientation/track-magnetic-deg");
 
                                // Environment
   fgUntie("/environment/magnetic-variation-deg");