Merge branch 'next' into attenuation

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

diff --git a/src/Instrumentation/tcas.hxx b/src/Instrumentation/tcas.hxx
index 2288a7dbeb438b2f2c5ca031a64a1280ce90ad02..fe8dda26be4b9aa2b95f6cd0b47b09c46b1662a9 100644 (file)
--- a/src/Instrumentation/tcas.hxx
+++ b/src/Instrumentation/tcas.hxx
@@ -28,9 +28,8 @@
 #include <map>
 
 #include <simgear/props/props.hxx>
-#include <simgear/sound/sample_openal.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
-#include "mk_viii.hxx" // FGVoicePlayer only
+#include <Sound/voiceplayer.hxx>
 
 using std::vector;
 using std::deque;
@@ -141,7 +140,8 @@ class TCAS : public SGSubsystem
     {
         double lat;
         double lon;
-        float  altFt;
+        float  pressureAltFt;
+        float  radarAltFt;
         float  heading;
         float  velocityKt;
         float  verticalFps;
@@ -325,8 +325,12 @@ class TCAS : public SGSubsystem
         void  horizontalThreat    (float bearing, float distanceNm, float heading,
                                    float velocityKt);
 
-        void  setAlt              (float altFt) { self.altFt = altFt;}
-        float getAlt              (void)        { return self.altFt;}
+        void  setPressureAlt      (float altFt) { self.pressureAltFt = altFt;}
+        float getPressureAlt      (void)        { return self.pressureAltFt;}
+
+        void  setRadarAlt         (float altFt) { self.radarAltFt = altFt;}
+        float getRadarAlt         (void)        { return self.radarAltFt;}
+
         float getVelocityKt       (void)        { return self.velocityKt;}
         int   getRASense          (void)        { return currentThreat.RASense;}
 
@@ -341,7 +345,8 @@ class TCAS : public SGSubsystem
 
         SGPropertyNode_ptr nodeLat;
         SGPropertyNode_ptr nodeLon;
-        SGPropertyNode_ptr nodeAlt;
+        SGPropertyNode_ptr nodePressureAlt;
+        SGPropertyNode_ptr nodeRadarAlt;
         SGPropertyNode_ptr nodeHeading;
         SGPropertyNode_ptr nodeVelocity;
         SGPropertyNode_ptr nodeVerticalFps;