Merge branch 'next' of D:\Git_New\flightgear into next

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

diff --git a/src/Instrumentation/HUD/HUD_dial.cxx b/src/Instrumentation/HUD/HUD_dial.cxx
index af917eeffe6c7fc14d4953ef4165523e0887e33f..d641dca9b5a4243d94117a998d6a49821c44e733 100644 (file)
--- a/src/Instrumentation/HUD/HUD_dial.cxx
+++ b/src/Instrumentation/HUD/HUD_dial.cxx
@@ -56,16 +56,16 @@ void HUD::Dial::draw(void)
 
 
     float offset = 90.0 * SGD_DEGREES_TO_RADIANS;
-    float r1 = 10.0; //size of carrot
+    const float R = 10.0; //size of carrot
     float theta = _input.getFloatValue();
 
     float theta1 = -theta * SGD_DEGREES_TO_RADIANS + offset;
     float x1 = _x + _radius * cos(theta1);
     float y1 = _y + _radius * sin(theta1);
-    float x2 = x1 - r1 * cos(theta1 - 30.0 * SGD_DEGREES_TO_RADIANS);
-    float y2 = y1 - r1 * sin(theta1 - 30.0 * SGD_DEGREES_TO_RADIANS);
-    float x3 = x1 - r1 * cos(theta1 + 30.0 * SGD_DEGREES_TO_RADIANS);
-    float y3 = y1 - r1 * sin(theta1 + 30.0 * SGD_DEGREES_TO_RADIANS);
+    float x2 = x1 - R * cos(theta1 - 30.0 * SGD_DEGREES_TO_RADIANS);
+    float y2 = y1 - R * sin(theta1 - 30.0 * SGD_DEGREES_TO_RADIANS);
+    float x3 = x1 - R * cos(theta1 + 30.0 * SGD_DEGREES_TO_RADIANS);
+    float y3 = y1 - R * sin(theta1 + 30.0 * SGD_DEGREES_TO_RADIANS);
 
     // draw carrot
     draw_line(x1, y1, x2, y2);