Merge branch 'next' into navaids-radio

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

diff --git a/src/Instrumentation/HUD/HUD.hxx b/src/Instrumentation/HUD/HUD.hxx
index 8539330f10447feb8be5dce4eec68f175b068b6d..f10c580f8844a068affc551ab78408b6fa405ad9 100644 (file)
--- a/src/Instrumentation/HUD/HUD.hxx
+++ b/src/Instrumentation/HUD/HUD.hxx
@@ -45,7 +45,6 @@ using std::vector;
 #include <Airports/runways.hxx>     // FGRunway
 #include <GUI/gui.h>                // fntRenderer ?   guiErrorMessage()
 #include <GUI/new_gui.hxx>          // FGFontCache, FGColor
-#include <Include/fg_typedefs.h>
 #include <Main/fg_props.hxx>
 
 
@@ -219,8 +218,8 @@ private:
     deque<Item *> _items;
     deque<Item *> _ladders;
 
-    SGPropertyNode_ptr _path;
-    SGPropertyNode_ptr _current;
+    SGPropertyNode_ptr _currentPath;
+    SGPropertyNode_ptr _currentColor;
     SGPropertyNode_ptr _visibility;
     SGPropertyNode_ptr _3DenabledN;
     SGPropertyNode_ptr _antialiasing;
@@ -269,7 +268,7 @@ public:
         _offset = n->getFloatValue("offset", offset);
         _min = n->getFloatValue("min", min);
         _max = n->getFloatValue("max", max);
-        _coeff = 1.0 - 1.0 / powf(10, fabsf(n->getFloatValue("damp", 0.0)));
+        _coeff = 1.0 - 1.0 / powf(10, fabs(n->getFloatValue("damp", 0.0)));
         SGPropertyNode *p = ((SGPropertyNode *)n)->getNode("property", false);
         if (p) {
             const char *path = p->getStringValue();