Merge branch 'maint2' into next

[flightgear.git] / src / Instrumentation / HUD / HUD_misc.cxx

diff --git a/src/Instrumentation/HUD/HUD_misc.cxx b/src/Instrumentation/HUD/HUD_misc.cxx
index ac7765592c9175a37686e8ca163e71a2feb7d231..021e22ba2208698c737b15b5f680d2ebf27aa313 100644 (file)
--- a/src/Instrumentation/HUD/HUD_misc.cxx
+++ b/src/Instrumentation/HUD/HUD_misc.cxx
@@ -22,7 +22,6 @@
 #  include <config.h>
 #endif
 
-#include <simgear/props/condition.hxx>
 #include "HUD.hxx"
 
 
@@ -32,8 +31,8 @@ HUD::AimingReticle::AimingReticle(HUD *hud, const SGPropertyNode *n, float x, fl
     Item(hud, n, x, y),
     _active_condition(0),
     _diameter(n->getNode("diameter-input", false)),
-    _bullet_size(_w / 3.0),
-    _inner_radius(_w)
+    _bullet_size(_w / 6.0),
+    _inner_radius(_w / 2.0)
 {
     const SGPropertyNode *node = n->getNode("active-condition");
     if (node)
@@ -46,9 +45,8 @@ void HUD::AimingReticle::draw(void)
     bool active = _active_condition ? _active_condition->test() : true;
     float diameter = _diameter.isValid() ? _diameter.getFloatValue() : 2.0f; // outer circle
 
-    Point centroid = get_centroid();
-    float x = centroid.x;
-    float y = centroid.y;
+    float x = _center_x;
+    float y = _center_y;
 
     if (active) { // stadiametric (4.2.4.4)
         draw_bullet(x, y, _bullet_size);